Linus Torvalds fefd26b3b8 Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/configh ... * master.kernel.org:/pub/scm/linux/kernel/git/davej/configh: Remove all inclusions of <linux/config.h> Manually resolved trivial path conflicts due to removed files in the sound/oss/ subdirectory.		2006-10-04 09:59:57 -07:00
..
aoe	[PATCH] aoe: cleanup i_rdev usage	2006-07-10 13:24:25 -07:00
paride	[PATCH] completions: lockdep annotate on stack completions	2006-10-01 00:39:24 -07:00
acsi_slm.c	[PATCH] devfs: Remove the devfs_fs_kernel.h file from the tree	2006-06-26 12:25:08 -07:00
acsi.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
amiflop.c	[PATCH] m68k: introduce irq controller	2006-06-25 10:00:57 -07:00
ataflop.c	[PATCH] Remove MODULE_PARM	2006-03-25 08:22:52 -08:00
cciss_cmd.h	[PATCH] cciss: support for >2TB logical volumes	2006-10-01 00:39:20 -07:00
cciss_scsi.c	[PATCH] completions: lockdep annotate on stack completions	2006-10-01 00:39:24 -07:00
cciss_scsi.h	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
cciss.c	Remove all inclusions of <linux/config.h>	2006-10-04 03:38:54 -04:00
cciss.h	[PATCH] cciss: support for >2TB logical volumes	2006-10-01 00:39:20 -07:00
cpqarray.c	Remove all inclusions of <linux/config.h>	2006-10-04 03:38:54 -04:00
cpqarray.h	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
cryptoloop.c	[BLOCK] cryptoloop: Use block ciphers where applicable	2006-09-21 11:45:53 +10:00
DAC960.c	[PATCH] completions: lockdep annotate on stack completions	2006-10-01 00:39:24 -07:00
DAC960.h	[PATCH] Generic boolean	2006-10-01 00:39:18 -07:00
floppy.c	[PATCH] Split struct request ->flags into two parts	2006-09-30 20:23:37 +02:00
ida_cmd.h	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
ida_ioctl.h	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
Kconfig	Fix bytes <-> kilobytes typo in Kconfig for ramdisk	2006-10-03 23:40:34 +02:00
loop.c	[PATCH] BLOCK: Move the loop device ioctl compat stuff to the loop driver [try #6]	2006-09-30 20:52:27 +02:00
Makefile	[PATCH] block: floppy98 removal, really.	2006-03-24 07:33:26 -08:00
nbd.c	[PATCH] Split struct request ->flags into two parts	2006-09-30 20:23:37 +02:00
pktcdvd.c	[PATCH] pktcdvd: rename a variable for better readability	2006-10-04 07:55:14 -07:00
ps2esdi.c	[PATCH] irq-flags: drivers/block Use the new IRQF_ constants	2006-07-02 13:58:49 -07:00
rd.c	[PATCH] ramdisk blocksize Kconfig entry	2006-07-14 21:53:53 -07:00
smart1,2.h	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
swim3.c	[POWERPC] Update swim3 printk after blkdev.h change	2006-10-04 14:52:13 +10:00
swim_iop.c	[PATCH] Remove ->rq_status from struct request	2006-09-30 20:29:23 +02:00
sx8.c	[PATCH] irq-flags: drivers/block Use the new IRQF_ constants	2006-07-02 13:58:49 -07:00
ub.c	USB: UB: Let cdrecord to see a device with media absent	2006-09-27 11:58:57 -07:00
umem.c	[PATCH] pr_debug: umem: repair nonexistant bh pr_debug reference	2006-10-03 08:04:19 -07:00
viodasd.c	[PATCH] devfs: Last little devfs cleanups throughout the kernel tree.	2006-06-26 12:25:09 -07:00
xd.c	[PATCH] Split struct request ->flags into two parts	2006-09-30 20:23:37 +02:00
xd.h	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
z2ram.c	[PATCH] devfs: Remove the gendisk devfs_name field as it's no longer needed	2006-06-26 12:25:08 -07:00