git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
30cd324
7e3cbc3
)
Merge branch 'x86/tsc' into tracing/core
author
Ingo Molnar
<mingo@elte.hu>
Thu, 25 Dec 2008 11:48:18 +0000
(12:48 +0100)
committer
Ingo Molnar
<mingo@elte.hu>
Thu, 25 Dec 2008 11:48:18 +0000
(12:48 +0100)
Merge it to resolve this incidental conflict between the BTS fixes/cleanups
and changes in x86/tsc:
Conflicts:
arch/x86/kernel/cpu/intel.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff