projects / linux / .git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 95c9608 68d00bb)
Merge branch 'x86/mm2' into x86/mm
authorH. Peter Anvin <hpa@linux.intel.com>
Fri, 15 Feb 2013 17:25:08 +0000 (09:25 -0800)
committerH. Peter Anvin <hpa@linux.intel.com>
Fri, 15 Feb 2013 17:25:08 +0000 (09:25 -0800)
commit0da3e7f526fde7a6522a3038b7ce609fc50f6707
treec6e2dacd96fe7eac8312f3d7c22e0995dc423879tree | snapshot
parent95c9608478d639dcffc14ea47b31bff021a99ed1commit | diff
parent68d00bbebb5a48b7a9056a8c03476a71ecbc30a6commit | diff
Merge branch 'x86/mm2' into x86/mm

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
arch/x86/kernel/setup.c diff1 | diff2 | blob | history
https://github.com/torvalds/linux.git