David S. Miller aa11d958d1 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... Conflicts: arch/microblaze/include/asm/socket.h		2009-08-12 17:44:53 -07:00
..
boot	powerpc/83xx: Fix PCI IO base address on MPC837xE-RDB boards	2009-07-29 23:18:41 -05:00
configs	powerpc: Update defconfigs for embedded 6xx/7xxx, 8xx, 8{3,5,6}xxx	2009-07-29 23:34:01 -05:00
include/asm	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2009-08-12 17:44:53 -07:00
kernel	perf_counter/powerpc: Check oprofile_cpu_type for NULL before using it	2009-08-06 13:55:09 +02:00
kvm	powerpc: Add configurable -Werror for arch/powerpc	2009-06-16 14:15:45 +10:00
lib	powerpc: Add configurable -Werror for arch/powerpc	2009-06-16 14:15:45 +10:00
math-emu
mm	powerpc/mm: Fix SMP issue with MMU context handling code	2009-07-29 23:05:43 -05:00
oprofile	powerpc: Remove unnecessary semicolons	2009-07-08 13:50:21 +10:00
platforms	powerpc/85xx: Fix ethernet link detection on MPC8569E-MDS boards	2009-07-29 23:14:18 -05:00
sysdev	powerpc: Don't use alloc_bootmem() in init_IRQ() path	2009-07-08 13:50:25 +10:00
xmon	powerpc: Add configurable -Werror for arch/powerpc	2009-06-16 14:15:45 +10:00
Kconfig	powerpc: Add irqtrace support for 32-bit powerpc	2009-06-26 14:37:27 +10:00
Kconfig.debug	powerpc: Add configurable -Werror for arch/powerpc	2009-06-16 14:15:45 +10:00
Makefile