From: H. Peter Anvin <hpa@linux.intel.com>
Date: Fri, 15 Feb 2013 17:25:08 +0000 (-0800)
Subject: Merge branch 'x86/mm2' into x86/mm
X-Git-Tag: v3.9-rc1~108^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0da3e7f526fde7a6522a3038b7ce609fc50f6707;p=pandora-kernel.git

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
---

0da3e7f526fde7a6522a3038b7ce609fc50f6707
Reading git-diff-tree failed