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 'dma-debug' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/linux-2.6-iommu into x86/urgent	2009-04-03 16:35:09 +02:00
configs
crypto
ia32	Merge branch 'linus' into perfcounters/core-v2	2009-04-06 09:02:57 +02: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	Merge branch 'tracing/core-v2' into tracing-for-linus	2009-04-02 00:49:02 +02:00
lguest	Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-lguest-and-virtio	2009-03-30 17:57:39 -07:00
lib
math-emu	Merge branch 'core/percpu' into percpu-cpumask-x86-for-linus-2	2009-03-27 17:28:43 +01:00
mm	perf_counter: provide major/minor page fault software events	2009-04-06 09:29:40 +02:00
oprofile	Merge branch 'linus' into perfcounters/core-v2	2009-04-06 09:02:57 +02:00
pci	x86, PAT: Remove duplicate memtype reserve in pci mmap	2009-04-03 14:43:29 -07:00
power	x86: disable stack-protector for __restore_processor_state()	2009-04-03 19:48:41 +02:00
vdso
video
xen	Merge branch 'linus' into cpumask-for-linus	2009-03-30 23:53:32 +02:00
Kconfig	Merge branch 'linus' into perfcounters/core	2009-04-07 12:05:25 +02:00
Kconfig.cpu
Kconfig.debug	generic debug pagealloc: build fix	2009-04-02 19:04:48 -07:00
Makefile
Makefile_32.cpu