android_kernel_google_msm/arch
H. Peter Anvin 48b1fddbb1 Merge branch 'irq/numa' into x86/mce3
Merge reason: arch/x86/kernel/irqinit_{32,64}.c unified in irq/numa
and modified in x86/mce3; this merge resolves the conflict.

Conflicts:
	arch/x86/kernel/irqinit.c

Signed-off-by: H. Peter Anvin <hpa@zytor.com>
2009-06-01 15:25:31 -07:00
..
alpha Merge branch 'linus' into irq/numa 2009-06-01 21:06:21 +02:00
arm Merge branch 'linus' into irq/numa 2009-06-01 21:06:21 +02:00
avr32
blackfin flat: fix data sections alignment 2009-05-29 08:40:02 -07:00
cris Merge branch 'linus' into irq/numa 2009-06-01 21:06:21 +02:00
frv
h8300 flat: fix data sections alignment 2009-05-29 08:40:02 -07:00
ia64
m32r flat: fix data sections alignment 2009-05-29 08:40:02 -07:00
m68k flat: fix data sections alignment 2009-05-29 08:40:02 -07:00
m68knommu
microblaze
mips Merge branch 'linus' into irq/numa 2009-06-01 21:06:21 +02:00
mn10300
parisc
powerpc Merge branch 'linus' into irq/numa 2009-06-01 21:06:21 +02:00
s390
sh flat: fix data sections alignment 2009-05-29 08:40:02 -07:00
sparc Merge branch 'linus' into irq/numa 2009-06-01 21:06:21 +02:00
um
x86 Merge branch 'irq/numa' into x86/mce3 2009-06-01 15:25:31 -07:00
xtensa
.gitignore
Kconfig