Dmitry Torokhov 95d465fd75 Manual merge with Linus. ... Conflicts: arch/powerpc/kernel/setup-common.c drivers/input/keyboard/hil_kbd.c drivers/input/mouse/hil_ptr.c		2006-04-02 00:08:05 -05:00
..
boot	Merge ../linux-2.6	2006-03-17 12:01:19 +11:00
configs	powerpc: Make uImage default build output for MPC8540 ADS	2006-03-27 23:44:37 -06:00
kernel	Manual merge with Linus.	2006-04-02 00:08:05 -05:00
lib	[PATCH] powerpc: fix various sparse warnings	2006-03-27 14:48:08 +11:00
math-emu	powerpc: move math-emu over to arch/powerpc	2006-03-27 23:43:27 -06:00
mm	[PATCH] for_each_possible_cpu: powerpc	2006-03-29 13:44:15 +11:00
oprofile	[PATCH] powerpc: Remove oprofile spinlock backtrace code	2006-03-29 13:44:16 +11:00
platforms	[PATCH] for_each_possible_cpu: powerpc	2006-03-29 13:44:15 +11:00
sysdev	Merge ../powerpc-merge	2006-02-24 14:05:47 +11:00
xmon	[PATCH] powerpc: add a raw dump command to xmon	2006-03-17 13:22:33 +11:00
Kconfig	powerpc: Move cpu_setup_6xx.S and temp.c over to arch/powerpc	2006-03-27 19:15:26 +11:00
Kconfig.debug	powerpc: remove OCP references	2006-03-27 23:48:37 -06:00
Makefile	powerpc: move math-emu over to arch/powerpc	2006-03-27 23:43:27 -06:00