Commit 5ea472a7 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

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: default avatarIngo Molnar <mingo@elte.hu>
parents 6c009ece 577c9c45
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment