tree a9ec5019e2b666a19874fc344ffb0dd5da6bce94
parent 6c009ecef8cca28c7c09eb16d0802e37915a76e1
parent 577c9c456f0e1371cbade38eaf91ae8e8a308555
author Ingo Molnar <mingo@elte.hu> 1239179730 +0200
committer Ingo Molnar <mingo@elte.hu> 1239179730 +0200

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>