tree 5c32738f0348449c2fa9688d52e6ecf4445d76f0
parent c5ecc484c528ff50bdbb16fbfbac758ee368b329
parent baac35c4155a8aa826c70acee6553368ca5243a2
author Jens Axboe <jens.axboe@oracle.com> 1267084085 +0100
committer Jens Axboe <jens.axboe@oracle.com> 1267084085 +0100

Merge branch 'master' into for-2.6.34

Conflicts:
	include/linux/blkdev.h

Signed-off-by: Jens Axboe <jens.axboe@oracle.com>