Ingo Molnar 5ea472a77f Merge commit 'v2.6.30-rc1' into perfcounters/core ... Conflicts: arch/powerpc/include/asm/systbl.h arch/powerpc/include/asm/unistd.h include/linux/init_task.h Merge reason: the conflicts are non-trivial: PowerPC placement of sys_perf_counter_open has to be mixed with the new preadv/pwrite syscalls. Signed-off-by: Ingo Molnar <mingo@elte.hu>		2009-04-08 10:35:30 +02:00
..
boot	Merge branch 'i2c-for-2630-v2' of git://aeryn.fluff.org.uk/bjdooks/linux	2009-04-07 08:45:12 -07:00
configs	powerpc/pseries: Enable relay in pseries_defconfig	2009-04-07 15:18:59 +10:00
include/asm	Merge commit 'v2.6.30-rc1' into perfcounters/core	2009-04-08 10:35:30 +02:00
kernel	Merge commit 'v2.6.30-rc1' into perfcounters/core	2009-04-08 10:35:30 +02: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	perf_counter: provide major/minor page fault software events	2009-04-06 09:29:40 +02:00
oprofile	powerpc/oprofile: G4 oprofile has variable number of counters	2009-03-11 17:10:16 +11:00
platforms	Merge commit 'v2.6.30-rc1' into perfcounters/core	2009-04-08 10:35:30 +02:00
sysdev	Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc	2009-04-07 07:40:55 -07:00
xmon	powerpc: Prepare xmon_save_regs for use with kdump	2008-12-23 15:13:28 +11:00
Kconfig	powerpc: Correct dependency of KEXEC	2009-04-07 15:19:00 +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