tree 5cf12980b8ad39b66f4c400fae062330d63d561c
parent b9719635f85b1d3c54775b53ea45fdd8e7496682
parent ba0593bf553c450a03dbc5f8c1f0ff58b778a0c8
author Linus Torvalds <torvalds@linux-foundation.org> 1221865869 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1221865869 -0700

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

* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86: completely disable NOPL on 32 bits
  x86/paravirt: Remove duplicate paravirt_pagetable_setup_{start, done}()
  xen: fix for xen guest with mem > 3.7G
  x86: fix possible x86_64 and EFI regression
  arch/x86/kernel/kdebugfs.c: introduce missing kfree