Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 7 Feb 2011 22:04:43 +0000 (14:04 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 7 Feb 2011 22:04:43 +0000 (14:04 -0800)
commit06262a6b8cf7999e7c2d756dcea7aabae0ee79a9
treeb59b80498b43035d91fc13b25dfaa66c51e0d882
parentfb2b2a1d37f80cc818fd4487b510f4e11816e5e1
parentd344e38b2c151ca5e5e39f562017127e93912528
Merge branch 'x86-fixes-for-linus' of git://git./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