Linus Torvalds de9b2fccb6 Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6 ... * master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6: (22 commits) acpiphp: Link-time error for PCI Hotplug shpchp: cleanup shpchp.h shpchp: remove shpchprm_get_physical_slot_number shpchp: cleanup struct controller shpchp: remove unnecessary struct php_ctlr PCI: ATI sb600 sata quirk PCI legacy resource fix PCI: don't export device IDs to userspace PCI: Be a bit defensive in quirk_nvidia_ck804() so we don't risk dereferencing a NULL pdev. PCI: Fix multiple problems with VIA hardware PCI: Only check the HT capability bits in mpic.c PCI: Use pci_find_ht_capability() in drivers/pci/quirks.c PCI: Add #defines for Hypertransport MSI fields PCI: Use pci_find_ht_capability() in drivers/pci/htirq.c PCI: Add pci_find_ht_capability() for finding Hypertransport capabilities PCI: Create __pci_bus_find_cap_start() from __pci_bus_find_cap() pci: Introduce pci_find_present PCI: pcieport-driver: remove invalid warning message rpaphp: compiler warning cleanup PCI quirks: remove redundant check ...		2006-12-21 00:01:47 -08:00
..
boot	[POWERPC] Fix build of cell zImage.initrd	2006-12-20 16:37:48 +11:00
configs	[POWERPC] cell: update cell_defconfig	2006-12-19 15:35:35 +01:00
kernel	[POWERPC] Fix register save area alignment for swapcontext syscall	2006-12-20 16:37:49 +11:00
lib	[POWERPC] Disallow kprobes on emulate_step and branch_taken	2006-11-01 15:14:12 +11:00
math-emu	[POWERPC] ppc math-emu needs -fno-builtin-fabs for math.c and fabs.c	2006-09-26 15:24:35 +10:00
mm	[PATCH] getting rid of all casts of k[cmz]alloc() calls	2006-12-13 09:05:58 -08:00
oprofile	[POWERPC] ps3: multiplatform build fixes	2006-12-04 20:41:16 +11:00
platforms	[POWERPC] Probe Efika platform before CHRP.	2006-12-20 16:37:48 +11:00
sysdev	PCI: Only check the HT capability bits in mpic.c	2006-12-20 10:54:43 -08:00
xmon	[POWERPC] Generic BUG for powerpc	2006-12-11 16:35:07 +11:00
.gitignore	[POWERPC] Add files build to .gitignore	2006-12-04 20:41:29 +11:00
Kconfig	Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc	2006-12-11 18:24:58 -08:00
Kconfig.debug	[POWERPC] Allow CONFIG_BOOTX_TEXT on iSeries	2006-12-04 20:41:58 +11:00
Makefile	[POWERPC] Create a "wrapper" script and use it in arch/powerpc/boot	2006-09-28 14:30:02 +10:00