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)
commitb1af9be5ef77898c05667bb9dbf3b180d91d3292
tree5c267d1d43d89fe51d9385a2401f3343ec2a856c
parenta051661ca6d134c18599498b185b667859d4339b
parent0cc15d03bcccdf95e2bd82e094e6064e61b54207
Merge branch 'upstream' of git://git./linux/kernel/git/jikos/floppy into for-3.6/drivers