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)
Conflicts:
include/linux/blkdev.h

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

Trivial merge