Arnd Bergmann 5b02ee3d21 asm-generic: merge branch 'master' of torvalds/linux-2.6 ... Fixes a merge conflict against the x86 tree caused by a fix to atomic.h which I renamed to atomic_long.h. Signed-off-by: Arnd Bergmann <arnd@arndb.de>		2009-06-12 11:32:58 +02: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/pmac: Update PowerMac 32-bit defconfig	2009-06-02 11:12:35 +10:00
include/asm	asm-generic: merge branch 'master' of torvalds/linux-2.6	2009-06-12 11:32:58 +02:00
kernel	perfcounters: remove powerpc definitions of perf_counter_do_pending	2009-06-11 20:03:13 -07:00
kvm	KVM: Fix interrupt unhalting a vcpu when it shouldn't	2009-06-10 11:48:33 +03:00
lib	powerpc: Move dma-noncoherent.c from arch/powerpc/lib to arch/powerpc/mm	2009-05-27 16:32:05 +10:00
math-emu	powerpc/math-emu: Fix efp dependence	2009-03-11 06:00:08 -05:00
mm	perf_counter: Standardize event names	2009-06-11 17:54:15 +02:00
oprofile	powerpc: Fix oprofile sampling of marked events on POWER7	2009-05-15 16:43:41 +10:00
platforms	Merge branch 'linus' into perfcounters/core	2009-06-11 17:55:42 +02:00
sysdev	Merge branch 'for-2.6.31' of git://git.kernel.dk/linux-2.6-block	2009-06-11 11:10:35 -07:00
xmon	powerpc: Prepare xmon_save_regs for use with kdump	2008-12-23 15:13:28 +11:00
Kconfig	powerpc: Fix up dma_alloc_coherent() on platforms without cache coherency.	2009-05-27 16:33:59 +10: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