tree 6440e1c679e097d0ea23bf879cd30983c5838419
parent 9301975ec251bab1ad7cfcb84a688b26187e4e4a
parent 3038edabf48f01421c621cb77a712b446d3a5d67
author Linus Torvalds <torvalds@linux-foundation.org> 1224534425 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1224534425 -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 ACPI: fix breakage of resume on 64-bit UP systems with SMP kernel
  Introduce is_vmalloc_or_module_addr() and use with DEBUG_VIRTUAL