git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
95c9608
68d00bb
)
Merge branch 'x86/mm2' into x86/mm
author
H. Peter Anvin
<hpa@linux.intel.com>
Fri, 15 Feb 2013 17:25:08 +0000
(09:25 -0800)
committer
H. Peter Anvin
<hpa@linux.intel.com>
Fri, 15 Feb 2013 17:25:08 +0000
(09:25 -0800)
x86/mm2 is testing out fine, but has developed conflicts with x86/mm
due to patches in adjacent code. Merge them so we can drop x86/mm2
and have a unified branch.
Resolved Conflicts:
arch/x86/kernel/setup.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff