git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
4bcf349
071a0bc
)
Merge branch 'linus' into perfcounters/core
author
Ingo Molnar
<mingo@elte.hu>
Fri, 13 Feb 2009 08:34:07 +0000
(09:34 +0100)
committer
Ingo Molnar
<mingo@elte.hu>
Fri, 13 Feb 2009 08:34:07 +0000
(09:34 +0100)
Conflicts:
arch/x86/kernel/acpi/boot.c
Trivial merge