Merge branch 'uek2-merge' of git://ca-git.us.oracle.com/linux-konrad-public

author Maxim Uvarov <maxim.uvarov@oracle.com>

Wed, 1 Aug 2012 15:37:03 +0000 (08:37 -0700)

committer Maxim Uvarov <maxim.uvarov@oracle.com>

Wed, 1 Aug 2012 15:37:03 +0000 (08:37 -0700)
author Maxim Uvarov <maxim.uvarov@oracle.com>
Wed, 1 Aug 2012 15:37:03 +0000 (08:37 -0700)
committer Maxim Uvarov <maxim.uvarov@oracle.com>
Wed, 1 Aug 2012 15:37:03 +0000 (08:37 -0700)
diff --cc arch/x86/xen/enlighten.c
Simple merge
diff --cc arch/x86/xen/mmu.c
Simple merge
author	Maxim Uvarov <maxim.uvarov@oracle.com>
	Wed, 1 Aug 2012 15:37:03 +0000 (08:37 -0700)
committer	Maxim Uvarov <maxim.uvarov@oracle.com>
	Wed, 1 Aug 2012 15:37:03 +0000 (08:37 -0700)
		1	2
arch/x86/xen/enlighten.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/x86/xen/mmu.c	patch \|	diff1 \|	diff2 \|	blob \| history