Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial

This commit is contained in:
Linus Torvalds 2005-11-11 16:29:22 -08:00
commit 63f45b8094
14 changed files with 20 additions and 124 deletions

View file

@ -97,6 +97,10 @@
* features to asm/floppy.h.
*/
/*
* 1998/1/21 -- Richard Gooch <rgooch@atnf.csiro.au> -- devfs support
*/
/*
* 1998/05/07 -- Russell King -- More portability cleanups; moved definition of
* interrupt and dma channel to asm/floppy.h. Cleaned up some formatting &
@ -158,10 +162,6 @@ static int print_unex = 1;
#define FDPATCHES
#include <linux/fdreg.h>
/*
* 1998/1/21 -- Richard Gooch <rgooch@atnf.csiro.au> -- devfs support
*/
#include <linux/fd.h>
#include <linux/hdreg.h>