Merge branch 'master' into for-linus
Jens Axboe [Fri, 19 Mar 2010 07:05:10 +0000 (08:05 +0100)]
Conflicts:
block/Kconfig

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

1  2 
block/blk-sysfs.c
drivers/block/drbd/drbd_int.h
drivers/scsi/sd.c
fs/bio.c

Simple merge
Simple merge
Simple merge
diff --cc fs/bio.c
Simple merge