David S. Miller bb803cfbec Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... Conflicts: drivers/scsi/fcoe/fcoe.c		2009-05-18 21:08:20 -07:00
..
boot	Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc	2009-05-15 08:05:02 -07:00
configs	powerpc/8xx: Update defconfigs	2009-05-13 17:29:08 -05:00
include/asm	Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc	2009-05-15 08:05:02 -07:00
kernel	powerpc: Fix PCI ROM access	2009-05-15 16:43:42 +10:00
kvm	KVM: ppc: e500: Fix the bug that KVM is unstable in SMP	2009-03-24 11:03:15 +02:00
lib	Merge commit 'origin/master' into next	2009-03-11 17:10:07 +11:00
math-emu	powerpc/math-emu: Fix efp dependence	2009-03-11 06:00:08 -05:00
mm	powerpc: Allow mem=x cmdline to work with 4G+	2009-05-15 16:43:41 +10:00
oprofile	powerpc: Fix oprofile sampling of marked events on POWER7	2009-05-15 16:43:41 +10:00
platforms	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2009-05-18 21:08:20 -07:00
sysdev	powerpc/mpic: Fix incorrect allocation of interrupt rev-map	2009-05-15 16:43:41 +10:00
xmon	powerpc: Prepare xmon_save_regs for use with kdump	2008-12-23 15:13:28 +11:00
Kconfig	Move dtc and libfdt sources from arch/powerpc/boot to scripts/dtc	2009-05-02 16:52:26 -07:00
Kconfig.debug	generic debug pagealloc: build fix	2009-04-02 19:04:48 -07:00
Makefile	powerpc/math-emu: Fix efp dependence	2009-03-11 06:00:08 -05:00