git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
f69feff
3c93390
)
Merge branch 'x86/pebs' into x86/unify-cpu-detect
author
Ingo Molnar
<mingo@elte.hu>
Wed, 10 Sep 2008 06:20:51 +0000
(08:20 +0200)
committer
Ingo Molnar
<mingo@elte.hu>
Wed, 10 Sep 2008 06:20:51 +0000
(08:20 +0200)
Conflicts:
arch/x86/Kconfig.cpu
include/asm-x86/ds.h
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Trivial merge