tree 112dbdeb68f0693d4b6db7d81cc0a7a89a13a438
parent bf5b1935d8e42b36a34645788eb261461fe07f2e
parent d8355aca23863be659ec5b7e0393cfbfa91ec221
author Linus Torvalds <torvalds@linux-foundation.org> 1215193606 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1215193606 -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:
  xen: fix address truncation in pte mfn<->pfn conversion
  arch/x86/mm/init_64.c: early_memtest(): fix types
  x86: fix Intel Mac booting with EFI