original_kernel/arch/powerpc/platforms
Ingo Molnar 940010c5a3 Merge branch 'linus' into perfcounters/core
Conflicts:
	arch/x86/kernel/irqinit.c
	arch/x86/kernel/irqinit_64.c
	arch/x86/kernel/traps.c
	arch/x86/mm/fault.c
	include/linux/sched.h
	kernel/exit.c
2009-06-11 17:55:42 +02:00
..
8xx
40x
44x
52xx
82xx
83xx
85xx
86xx
512x
amigaone
cell
chrp
embedded6xx
iseries
maple
pasemi
powermac
prep
ps3
pseries
Kconfig
Kconfig.cputype
Makefile
fsl_uli1575.c