tree 01fb5e044c7c5ed8b8c7a46ab9f39b0c6ef43897
parent 229993001282e128a49a59ec43d255614775703a
parent 64282278989d5b0398dcb3ba7904cb00c621dc35
author Linus Torvalds <torvalds@linux-foundation.org> 1349115257 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1349115257 -0700

Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull x86/platform changes from Ingo Molnar:
 "This cleans up some Xen-induced pagetable init code uglies, by
  generalizing new platform callbacks and state: x86_init.paging.*"

* 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86: Document x86_init.paging.pagetable_init()
  x86: xen: Cleanup and remove x86_init.paging.pagetable_setup_done()
  x86: Move paging_init() call to x86_init.paging.pagetable_init()
  x86: Rename pagetable_setup_start() to pagetable_init()
  x86: Remove base argument from x86_init.paging.pagetable_setup_start