linux/arch
Linus Torvalds 5f78e4d339 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86-bigbox-pci
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86-bigbox-pci:
  x86: add pci=check_enable_amd_mmconf and dmi check
  x86: work around io allocation overlap of HT links
  acpi: get boot_cpu_id as early for k8_scan_nodes
  x86_64: don't need set default res if only have one root bus
  x86: double check the multi root bus with fam10h mmconf
  x86: multi pci root bus with different io resource range, on 64-bit
  x86: use bus conf in NB conf fun1 to get bus range on, on 64-bit
  x86: get mp_bus_to_node early
  x86 pci: remove checking type for mmconfig probe
  x86: remove unneeded check in mmconf reject
  driver core: try parent numa_node at first before using default
  x86: seperate mmconf for fam10h out from setup_64.c
  x86: if acpi=off, force setting the mmconf for fam10h
  x86_64: check MSR to get MMCONFIG for AMD Family 10h
  x86_64: check and enable MMCONFIG for AMD Family 10h
  x86_64: set cfg_size for AMD Family 10h in case MMCONFIG
  x86: mmconf enable mcfg early
  x86: clear pci_mmcfg_virt when mmcfg get rejected
  x86: validate against acpi motherboard resources

Fixed up fairly trivial conflicts in arch/x86/pci/{init.c,pci.h} due to
OLPC support manually.
2008-04-29 08:26:51 -07:00
..
alpha alpha: use kbuild.h instead of macros in asm-offsets.c 2008-04-29 08:06:29 -07:00
arm arm: use kbuild.h instead of macros in asm-offsets.c 2008-04-29 08:06:29 -07:00
avr32 avr32: use kbuild.h macros instead of defining macros in asm-offsets.c 2008-04-29 08:06:29 -07:00
blackfin blackfin: use kbuild.h instead of defining macros in asm-macros.c 2008-04-29 08:06:29 -07:00
cris cris: use non-racy method for /proc/system_profile creation 2008-04-29 08:06:21 -07:00
frv frv: use kbuild.h instead of defining macros in asm-offsets.c 2008-04-29 08:06:30 -07:00
h8300 h8300: use kbuild.h instead of defining macros in asm-offsets.c 2008-04-29 08:06:30 -07:00
ia64 ia64: use kbuild.h macros instead of defining macros in asm-offsets.c 2008-04-29 08:06:29 -07:00
m32r Generic semaphore implementation 2008-04-17 10:42:34 -04:00
m68k m68k/m68kmmu: use kbuild.h instead of defining macros in asm-offsets.c 2008-04-29 08:06:30 -07:00
m68knommu m68k/m68kmmu: use kbuild.h instead of defining macros in asm-offsets.c 2008-04-29 08:06:30 -07:00
mips mips: use kbuild.h instead of macros in asm-offsets.c 2008-04-29 08:06:29 -07:00
mn10300 mn10300: use kbuild.h instead of defining macros in asm-offsets.c 2008-04-29 08:06:30 -07:00
parisc parisc: use kbuild.h instead of defining macros in asm-offsets.c 2008-04-29 08:06:30 -07:00
powerpc Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc 2008-04-29 08:19:14 -07:00
ppc ppc/powerpc: use kbuild.h instead of defining macros in asm-offsets.c 2008-04-29 08:06:30 -07:00
s390 s390: use kbuild.h instead of defining macros in asm-offsets.c 2008-04-29 08:06:30 -07:00
sh sh: use kbuild.h instead of defining macros in asm-offsets.c 2008-04-29 08:06:30 -07:00
sparc sparc: use kbuild.h instead of defining macros in asm-offsets.c 2008-04-29 08:06:29 -07:00
sparc64 iomap: fix 64 bits resources on 32 bits 2008-04-29 08:06:02 -07:00
um proc: remove proc_root from drivers 2008-04-29 08:06:18 -07:00
v850 v850: use kbuild.h instead of defining macros in asm-offsets.c 2008-04-29 08:06:30 -07:00
x86 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86-bigbox-pci 2008-04-29 08:26:51 -07:00
xtensa xtensa: use kbuild.h macros instead of defining them in asm-offsets.c 2008-04-29 08:06:29 -07:00
.gitignore
Kconfig dma: add dma_*map*_attrs() interfaces 2008-04-29 08:06:11 -07:00