linux/arch
Ingo Molnar 3825c9e8d0 Merge commit 'v2.6.27-rc1' into x86/microcode
Conflicts:

	arch/x86/kernel/microcode.c

Manual resolutions:

	arch/x86/kernel/microcode_amd.c
	arch/x86/kernel/microcode_intel.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>
2008-07-29 11:54:24 +02:00
..
alpha [PATCH] sanitize __user_walk_fd() et.al. 2008-07-26 20:53:34 -04:00
arm Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 2008-07-28 18:14:24 -07:00
avr32 avr32: some mmc/sd cleanups 2008-07-27 13:57:36 +02:00
blackfin Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/blackfin-2.6 2008-07-26 13:23:17 -07:00
cris Merge branch 'linus' into core/generic-dma-coherent 2008-07-29 00:07:55 +02:00
frv frv: use generic show_mem() 2008-07-26 12:00:11 -07:00
h8300 h8300: use generic show_mem() 2008-07-26 12:00:11 -07:00
ia64 KVM: ia64: Fix irq disabling leak in error handling code 2008-07-27 11:35:32 +03:00
m32r m32r: use generic show_mem() 2008-07-26 12:00:11 -07:00
m68k m68k: use generic show_mem() 2008-07-26 12:00:11 -07:00
m68knommu m68knommu: use generic show_mem() 2008-07-26 12:00:11 -07:00
mips mips: use generic show_mem() 2008-07-26 12:00:11 -07:00
mn10300 mn10300: use generic show_mem() 2008-07-26 12:00:11 -07:00
parisc [PATCH] sanitize __user_walk_fd() et.al. 2008-07-26 20:53:34 -04:00
powerpc powerpc: Disable 64K hugetlb support when doing 64K SPU mappings 2008-07-28 16:30:53 +10:00
s390 stop_machine: Wean existing callers off stop_machine_run() 2008-07-28 12:16:31 +10:00
sh Merge branch 'linus' into core/generic-dma-coherent 2008-07-29 00:07:55 +02:00
sparc sparc: Set CONFIG_HAVE_ARCH_TRACEHOOK 2008-07-27 17:34:02 -07:00
sparc64 sparc64: tracehook: CONFIG_HAVE_ARCH_TRACEHOOK 2008-07-27 17:33:07 -07:00
um um: use generic show_mem() 2008-07-26 12:00:10 -07:00
x86 Merge commit 'v2.6.27-rc1' into x86/microcode 2008-07-29 11:54:24 +02:00
xtensa xtensa: use generic show_mem() 2008-07-26 12:00:10 -07:00
.gitignore arch: Ignore arch/i386 and arch/x86_64 2008-01-19 21:29:39 -08:00
Kconfig tracehook: CONFIG_HAVE_ARCH_TRACEHOOK 2008-07-26 12:00:09 -07:00