git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
13b2eda
13093cb
)
Merge branches 'x86/urgent' and 'x86/pat' into x86/core
author
Ingo Molnar
<mingo@elte.hu>
Thu, 26 Feb 2009 05:31:23 +0000
(06:31 +0100)
committer
Ingo Molnar
<mingo@elte.hu>
Thu, 26 Feb 2009 05:31:23 +0000
(06:31 +0100)
Conflicts:
arch/x86/include/asm/pat.h
Trivial merge