| commit | b1af9be5ef77898c05667bb9dbf3b180d91d3292 | [log] [tgz] |
|---|---|---|
| author | Jens Axboe <axboe@kernel.dk> | Tue Jul 24 13:15:08 2012 +0200 |
| committer | Jens Axboe <axboe@kernel.dk> | Tue Jul 24 13:15:08 2012 +0200 |
| tree | 5c267d1d43d89fe51d9385a2401f3343ec2a856c | |
| parent | a051661ca6d134c18599498b185b667859d4339b [diff] | |
| parent | 0cc15d03bcccdf95e2bd82e094e6064e61b54207 [diff] |
Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/floppy into for-3.6/drivers