Linus Torvalds 78149df6d5 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: (41 commits) Revert "PCI: remove duplicate device id from ata_piix" msi: Make MSI useable more architectures msi: Kill the msi_desc array. msi: Remove attach_msi_entry. msi: Fix msi_remove_pci_irq_vectors. msi: Remove msi_lock. msi: Kill msi_lookup_irq MSI: Combine pci_(save|restore)_msi/msix_state MSI: Remove pci_scan_msi_device() MSI: Replace pci_msi_quirk with calls to pci_no_msi() PCI: remove duplicate device id from ipr PCI: remove duplicate device id from ata_piix PCI: power management: remove noise on non-manageable hw PCI: cleanup MSI code PCI: make isa_bridge Alpha-only PCI: remove quirk_sis_96x_compatible() PCI: Speed up the Intel SMBus unhiding quirk PCI Quirk: 1k I/O space IOBL_ADR fix on P64H2 shpchp: delete trailing whitespace shpchp: remove DBG_XXX_ROUTINE ...		2007-02-07 19:23:44 -08:00
..
boot	[POWERPC] Make it blatantly clear; mpc5200 device tree is not yet stable	2007-01-22 21:27:35 +11:00
configs	[POWERPC] Update defconfigs	2007-01-22 22:39:24 +11:00
kernel	MSI: Remove pci_scan_msi_device()	2007-02-07 15:50:07 -08: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	[POWERPC] Fix bogus BUG_ON() in in hugetlb_get_unmapped_area()	2007-01-09 17:03:01 +11:00
oprofile	[POWERPC] ps3: multiplatform build fixes	2006-12-04 20:41:16 +11:00
platforms	[POWERPC] ps3_free_io_irq: Fix inverted error check	2007-01-24 21:08:14 +11:00
sysdev	[POWERPC] Fix cell's mmio nvram to properly parse device tree	2007-01-22 21:27:35 +11: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	USB: ps3 ohci bus glue	2007-02-07 15:44:37 -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