Paul Mackerras 8a3e1c670e Merge branch 'merge' ... Conflicts: arch/powerpc/sysdev/fsl_soc.c		2008-06-09 12:19:41 +10:00
..
4xx_io	[POWERPC] Spelling fixes: arch/ppc/	2007-05-12 11:32:49 +10:00
8xx_io	Merge branch 'powerpc-next' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc	2008-04-24 20:57:20 +10:00
8260_io	[PPC] Remove mpc8272 ads board from arch/ppc	2008-04-21 10:19:09 -05:00
boot	[POWERPC] CPM: Rename commproc to cpm1 and cpm2_common.c to cpm2.c	2008-01-28 08:31:05 -06:00
configs	Merge branch 'powerpc-next' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc	2008-04-24 20:57:20 +10:00
kernel	Merge branch 'merge'	2008-06-09 12:19:41 +10:00
lib	[POWERPC] Add strncmp to arch/ppc	2008-04-24 20:57:34 +10:00
mm	[POWERPC] ppc: Remove redundant display of free swap space in show_mem()	2008-04-01 20:45:16 +11:00
platforms	[POWERPC] ppc: More compile fixes	2008-05-12 22:57:51 +10:00
syslib	mv643xx_eth: get rid of static variables, allow multiple instances	2008-04-28 21:17:07 -07:00
xmon	[POWERPC] CPM: Rename commproc to cpm1 and cpm2_common.c to cpm2.c	2008-01-28 08:31:05 -06:00
.gitignore	[POWERPC] Only ignore arch/ppc/include, not arch/ppc/boot/include	2007-08-17 11:01:51 +10:00
Kconfig	[PPC] Remove mpc885ads and mpc86x ads boards from arch/ppc	2008-04-21 10:19:09 -05:00
Kconfig.debug	ppc: Remove CHRP, POWER3 and POWER4 support from arch/ppc	2006-03-28 10:22:10 +11:00
Makefile	[POWERPC] ppc: Use ebony_defconfig for defconfig	2008-05-12 20:27:50 +10:00