Merge branch 'in-3.1/bug.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git...

author Guru Anbalagane <guru.anbalagane@oracle.com>

Tue, 6 Sep 2011 06:38:28 +0000 (23:38 -0700)

committer Guru Anbalagane <guru.anbalagane@oracle.com>

Tue, 6 Sep 2011 06:38:28 +0000 (23:38 -0700)
author Guru Anbalagane <guru.anbalagane@oracle.com>
Tue, 6 Sep 2011 06:38:28 +0000 (23:38 -0700)
committer Guru Anbalagane <guru.anbalagane@oracle.com>
Tue, 6 Sep 2011 06:38:28 +0000 (23:38 -0700)
diff --cc arch/x86/xen/enlighten.c
Simple merge
diff --cc arch/x86/xen/mmu.c
Simple merge
author	Guru Anbalagane <guru.anbalagane@oracle.com>
	Tue, 6 Sep 2011 06:38:28 +0000 (23:38 -0700)
committer	Guru Anbalagane <guru.anbalagane@oracle.com>
	Tue, 6 Sep 2011 06:38:28 +0000 (23:38 -0700)
		1	2
arch/x86/xen/enlighten.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/x86/xen/mmu.c	patch \|	diff1 \|	diff2 \|	blob \| history