From: Jens Axboe Date: Tue, 31 Jul 2012 09:47:36 +0000 (+0200) Subject: Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/floppy... X-Git-Tag: v3.6-rc1~19^2 X-Git-Url: http://pileus.org/git/?p=~andy%2Flinux;a=commitdiff_plain;h=10af8138eb6d09d6a768e43ef1aa9b2f16b8c7be Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/floppy into for-3.6/drivers --- 10af8138eb6d09d6a768e43ef1aa9b2f16b8c7be