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: MMI-PSA29.97-13-9~16196^2 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=10af8138eb6d09d6a768e43ef1aa9b2f16b8c7be;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git Merge branch 'upstream' of git://git./linux/kernel/git/jikos/floppy into for-3.6/drivers --- 10af8138eb6d09d6a768e43ef1aa9b2f16b8c7be