Merge branch 'for-jens' of git://git.drbd.org/linux-drbd into for-3.6/drivers
authorJens Axboe <axboe@kernel.dk>
Mon, 30 Jul 2012 07:03:10 +0000 (09:03 +0200)
committerJens Axboe <axboe@kernel.dk>
Mon, 30 Jul 2012 07:03:10 +0000 (09:03 +0200)
commit72ea1f74fcdf874cca6d2c0962379523bbd99e2c
tree4c67be6c73356086ff44ef1b8b1c9479702689ca
parentb1af9be5ef77898c05667bb9dbf3b180d91d3292
parenta73ff3231df59a4b92ccd0dd4e73897c5822489b
Merge branch 'for-jens' of git://git.drbd.org/linux-drbd into for-3.6/drivers
drivers/block/floppy.c