Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/floppy...
authorJens Axboe <axboe@kernel.dk>
Tue, 24 Jul 2012 11:15:08 +0000 (13:15 +0200)
committerJens Axboe <axboe@kernel.dk>
Tue, 24 Jul 2012 11:15:08 +0000 (13:15 +0200)

Trivial merge