]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 424aa42 a804808)
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)
commit7738c8432ec1edbe44cb060c4acbc0dbc47bc6cd
treec6e2dacd96fe7eac8312f3d7c22e0995dc423879tree | snapshot
parent424aa4219d3dd291a47953f7f2e2130127f34716commit | diff
parenta8048088a1f2936753b1daf231287bea79e878d1commit | 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
Linux Kernel Source Tree.