Merge branch 'topic/jack-mechanical' into to-push
[linux-2.6] / drivers / ide / ide-floppy_proc.c
2008-10-13  Linus TorvaldsMerge git://git./linux/kernel/git/bart/ide-2.6
2008-10-13  Bartlomiej Zolnier... ide-floppy: move /proc handling to ide-floppy_proc...