projects / cascardo / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 6c009ec 577c9c4)
Merge commit 'v2.6.30-rc1' into perfcounters/core
authorIngo Molnar <mingo@elte.hu>
Wed, 8 Apr 2009 08:35:30 +0000 (10:35 +0200)
committerIngo Molnar <mingo@elte.hu>
Wed, 8 Apr 2009 08:35:30 +0000 (10:35 +0200)
commit5ea472a77f8e4811ceee3f44a9deda6ad6e8b789
treea9ec5019e2b666a19874fc344ffb0dd5da6bce94tree | snapshot
parent6c009ecef8cca28c7c09eb16d0802e37915a76e1commit | diff
parent577c9c456f0e1371cbade38eaf91ae8e8a308555commit | diff
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>
arch/powerpc/include/asm/systbl.h diff1 | diff2 | blob | history
arch/powerpc/include/asm/unistd.h diff1 | diff2 | blob | history
arch/powerpc/kernel/irq.c diff1 | diff2 | blob | history
include/linux/init_task.h diff1 | diff2 | blob | history
include/linux/sched.h diff1 | diff2 | blob | history
init/Kconfig diff1 | diff2 | blob | history
kernel/Makefile diff1 | diff2 | blob | history
kernel/exit.c diff1 | diff2 | blob | history
kernel/fork.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.