From: Jens Axboe Date: Tue, 24 Jul 2012 11:15:08 +0000 (+0200) Subject: Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/floppy... X-Git-Tag: v3.6-rc1~6^2~10 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b1af9be5ef77898c05667bb9dbf3b180d91d3292;p=thirdparty%2Flinux.git Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/floppy into for-3.6/drivers --- b1af9be5ef77898c05667bb9dbf3b180d91d3292