git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
6c009ec
577c9c4
)
Merge commit 'v2.6.30-rc1' into perfcounters/core
author
Ingo Molnar
<mingo@elte.hu>
Wed, 8 Apr 2009 08:35:30 +0000
(10:35 +0200)
committer
Ingo Molnar
<mingo@elte.hu>
Wed, 8 Apr 2009 08:35:30 +0000
(10:35 +0200)
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>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff