Merge remote-tracking branch 'xen-tip/linux-next'

author Stephen Rothwell <sfr@canb.auug.org.au>

Fri, 30 May 2014 04:44:39 +0000 (14:44 +1000)

committer Stephen Rothwell <sfr@canb.auug.org.au>

Fri, 30 May 2014 04:44:39 +0000 (14:44 +1000)
author Stephen Rothwell <sfr@canb.auug.org.au>
Fri, 30 May 2014 04:44:39 +0000 (14:44 +1000)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Fri, 30 May 2014 04:44:39 +0000 (14:44 +1000)
diff --cc arch/x86/xen/enlighten.c
Simple merge
diff --cc arch/x86/xen/mmu.c
Simple merge
diff --cc arch/x86/xen/setup.c
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 30 May 2014 04:44:39 +0000 (14:44 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 30 May 2014 04:44:39 +0000 (14:44 +1000)
		1	2
arch/x86/xen/enlighten.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/x86/xen/mmu.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/x86/xen/setup.c	patch \|	diff1 \|	diff2 \|	blob \| history