David Howells 9db7372445 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 ... Conflicts: drivers/ata/libata-scsi.c include/linux/libata.h Futher merge of Linus's head and compilation fixups. Signed-Off-By: David Howells <dhowells@redhat.com>		2006-12-05 17:01:28 +00:00
..
boot	[POWERPC] ps3: add a default zImage target	2006-12-05 11:28:17 +11:00
configs	[POWERPC] Linkstation / kurobox support	2006-12-04 20:42:08 +11:00
kernel	[POWERPC] Add missing EXPORTS for mpc52xx support	2006-12-05 11:34:37 +11:00
lib	[POWERPC] Disallow kprobes on emulate_step and branch_taken	2006-11-01 15:14:12 +11:00
math-emu	[POWERPC] ppc math-emu needs -fno-builtin-fabs for math.c and fabs.c	2006-09-26 15:24:35 +10:00
mm	[POWERPC] Fix cputable.h for combined build	2006-12-04 20:41:59 +11:00
oprofile	[POWERPC] ps3: multiplatform build fixes	2006-12-04 20:41:16 +11:00
platforms	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6	2006-12-05 17:01:28 +00:00
sysdev	[POWERPC] Replace kmalloc+memset with kzalloc	2006-12-04 20:42:09 +11:00
xmon	[POWERPC] Allow xmon to build on legacy iSeries	2006-12-04 20:41:56 +11:00
.gitignore	[POWERPC] Add files build to .gitignore	2006-12-04 20:41:29 +11:00
Kconfig	[POWERPC] Remove obsolete PPC_52xx and update CLASSIC32 comment	2006-12-05 11:33:53 +11:00
Kconfig.debug	[POWERPC] Allow CONFIG_BOOTX_TEXT on iSeries	2006-12-04 20:41:58 +11:00
Makefile	[POWERPC] Create a "wrapper" script and use it in arch/powerpc/boot	2006-09-28 14:30:02 +10:00