Merge branch 'master' into for-2.6.34
authorJens Axboe <jens.axboe@oracle.com>
Thu, 25 Feb 2010 07:48:05 +0000 (08:48 +0100)
committerJens Axboe <jens.axboe@oracle.com>
Thu, 25 Feb 2010 07:48:05 +0000 (08:48 +0100)
commit7f03292ee16e68be96aa88904afc6152f8d37736
tree5c32738f0348449c2fa9688d52e6ecf4445d76f0
parentc5ecc484c528ff50bdbb16fbfbac758ee368b329
parentbaac35c4155a8aa826c70acee6553368ca5243a2
Merge branch 'master' into for-2.6.34

Conflicts:
include/linux/blkdev.h

Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
block/blk-core.c
include/linux/blkdev.h