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
..
qe_lib	[POWERPC] Add QUICC Engine (QE) infrastructure	2006-10-04 15:24:27 +10:00
cpm2_common.c	POWERPC: overhaul with cpm2_map mechanism	2006-09-21 22:38:05 +04:00
cpm2_pic.c	POWERPC: 8272ads merge to powerpc: common stuff	2006-10-03 21:36:00 +04:00
cpm2_pic.h	POWERPC: 8272ads merge to powerpc: common stuff	2006-10-03 21:36:00 +04:00
dart_iommu.c
dart.h
dcr.S
fsl_soc.c	POWERPC: 8272ads merge to powerpc: common stuff	2006-10-03 21:36:00 +04:00
fsl_soc.h	Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/vitb/linux-2.6-PQ	2006-09-28 07:18:28 +10:00
grackle.c
i8259.c
indirect_pci.c
ipic.c	fix file specification in comments	2006-10-03 23:01:26 +02:00
ipic.h
Makefile	[POWERPC] Add QUICC Engine (QE) infrastructure	2006-10-04 15:24:27 +10:00
mmio_nvram.c
mpic.c	[PATCH] Add Hypertransport capability defines	2006-10-04 07:55:29 -07:00
todc.c
tsi108_dev.c	Remove all inclusions of <linux/config.h>	2006-10-04 03:38:54 -04:00
tsi108_pci.c