Linus Torvalds 6a84258e5f 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: (37 commits) PCI: merge almost all of pci_32.h and pci_64.h together PCI: X86: Introduce and enable PCI domain support PCI: Add 'nodomains' boot option, and pci_domains_supported global PCI: modify PCI bridge control ISA flag for clarity PCI: use _CRS for PCI resource allocation PCI: avoid P2P prefetch window for expansion ROMs PCI: skip ISA ioresource alignment on some systems PCI: remove transparent bridge sizing pci: write file size to inode on proc bus file write pci: use size stored in proc_dir_entry for proc bus files pci: implement "pci=noaer" PCI: fix IDE legacy mode resources MSI: Use correct data offset for 32-bit MSI in read_msi_msg() PCI: Fix incorrect argument order to list_add_tail() in PCI dynamic ID code PCI: i386: Compaq EVO N800c needs PCI bus renumbering PCI: Remove no longer correct documentation regarding MSI vector assignment PCI: re-enable onboard sound on "MSI K8T Neo2-FIR" PCI: quirk_vt82c586_acpi: Omit reading PCI revision ID PCI: quirk amd_8131_mmrbc: Omit reading pci revision ID cpqphp: Use PCI_CLASS_REVISION instead of PCI_REVISION_ID for read ...		2007-10-12 15:50:23 -07:00
..
alpha	alpha: -Werror fixes for sys_titan.c	2007-08-11 15:47:42 -07:00
arm	Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq	2007-10-12 15:42:01 -07:00
avr32	[AVR32] Fix random segfault with preemption	2007-10-11 13:32:56 +02:00
blackfin	Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6	2007-10-12 15:49:10 -07:00
cris	ide: fix hidden dependencies on CONFIG_IDE_GENERIC	2007-08-20 22:42:54 +02:00
frv	FRV: connect up fallocate	2007-08-11 15:47:40 -07:00
h8300	H8/300: Fix misnamed "CONFIG_BLKDEV_RESERVE_ADDRESS" Kconfig variable	2007-09-11 17:21:20 -07:00
i386	Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6	2007-10-12 15:50:23 -07:00
ia64	Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6	2007-10-12 15:49:37 -07:00
m32r	m32r: Rename STI/CLI macros	2007-09-06 11:10:56 +09:00
m68k	m68k(nommu): add missing syscalls	2007-09-11 17:21:20 -07:00
m68knommu	m68k(nommu): add missing syscalls	2007-09-11 17:21:20 -07:00
mips	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6	2007-10-11 19:40:14 -07:00
parisc	[PARISC] Add NOTES section	2007-08-27 00:29:25 -04:00
powerpc	Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6	2007-10-12 15:49:37 -07:00
ppc	[POWERPC] Remove redundant reference to non-existent CONFIG_BOOTIMG	2007-10-09 21:02:00 +10:00
s390	[S390] pfault: Fix alignment of parameter list.	2007-10-12 16:13:11 +02:00
sh	Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq	2007-10-12 15:42:01 -07:00
sh64	sh64: arch/sh64/kernel/setup.c: duplicate include removal.	2007-08-12 12:18:54 +09:00
sparc	[SPARC]: Fix EBUS use of uninitialized variable.	2007-09-27 13:09:28 -07:00
sparc64	Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq	2007-10-12 15:42:01 -07:00
um	i386/x86_64: move headers to include/asm-x86	2007-10-11 11:20:03 +02:00
v850	PTRACE_POKEDATA consolidation	2007-07-17 10:23:03 -07:00
x86	Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6	2007-10-12 15:50:23 -07:00
x86_64	Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6	2007-10-12 15:50:23 -07:00
xtensa	xtensa process.c must #include <linux/fs.h>	2007-08-30 09:58:22 -07:00