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

4.7 KiB

Raw Blame History

View Raw