tree b59b80498b43035d91fc13b25dfaa66c51e0d882
parent fb2b2a1d37f80cc818fd4487b510f4e11816e5e1
parent d344e38b2c151ca5e5e39f562017127e93912528
author Linus Torvalds <torvalds@linux-foundation.org> 1297116283 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1297116283 -0800

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, nx: Mark the ACPI resume trampoline code as +x