git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
d278c48
8e49215
)
Merge commit 'v2.6.29-rc4' into perfcounters/core
author
Ingo Molnar
<mingo@elte.hu>
Wed, 11 Feb 2009 08:22:04 +0000
(09:22 +0100)
committer
Ingo Molnar
<mingo@elte.hu>
Wed, 11 Feb 2009 08:22:04 +0000
(09:22 +0100)
Conflicts:
arch/x86/kernel/setup_percpu.c
arch/x86/mm/fault.c
drivers/acpi/processor_idle.c
kernel/irq/handle.c
Trivial merge