Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 24 Nov 2010 23:35:53 +0000 (08:35 +0900)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 24 Nov 2010 23:35:53 +0000 (08:35 +0900)
commit8a3fbc9fdb4fd8f0970ab1a98f694ff25b7d5b47
treee1680876ad4a0267868efc855f070549274f147f
parentc12ae95ccc2dc80b4bd57363240cdb6eab2adcbc
parente6d4a76dbf2ff27314e09291dfb9e4afcb9ecd60
Merge branch 'for-linus' of git://git./linux/kernel/git/konrad/xen

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
  xen: remove duplicated #include
  xen: x86/32: perform initial startup on initial_page_table
arch/x86/xen/enlighten.c
arch/x86/xen/mmu.c
arch/x86/xen/setup.c