Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/floppy into for-3.6/drivers

Browse source

...

This commit is contained in:

Jens Axboe 2012-07-24 13:15:08 +02:00

parent a051661ca6 0cc15d03bc

commit b1af9be5ef

1 changed files with 20 additions and 1 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

21

drivers/block/floppy.c

View file