Merge branch 'master' into for-linus
authorJens Axboe <jens.axboe@oracle.com>
Fri, 19 Mar 2010 07:05:10 +0000 (08:05 +0100)
committerJens Axboe <jens.axboe@oracle.com>
Fri, 19 Mar 2010 07:05:10 +0000 (08:05 +0100)
commitb4b7a4ef097f288f724420b473dbf92a89c0ab7e
tree23ad8101e3e77c32a8d1e1b95a9c1cd7f7a475b7
parente9ce335df51ff782035a15c261a3c0c9892a1767
parenta3d3203e4bb40f253b1541e310dc0f9305be7c84
Merge branch 'master' into for-linus

Conflicts:
block/Kconfig

Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
block/blk-sysfs.c
drivers/block/drbd/drbd_int.h
drivers/scsi/sd.c
fs/bio.c