git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
da7878d
fb2e405
)
Merge branch 'linus' into x86/pebs
author
Ingo Molnar
<mingo@elte.hu>
Fri, 25 Jul 2008 09:37:07 +0000
(11:37 +0200)
committer
Ingo Molnar
<mingo@elte.hu>
Fri, 25 Jul 2008 09:37:07 +0000
(11:37 +0200)
Conflicts:
arch/x86/Kconfig.cpu
arch/x86/kernel/cpu/intel.c
arch/x86/kernel/setup_64.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff