]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit6fd73c22df4bb31bee07f7d0e6eef7a532e501a2
treeb59b80498b43035d91fc13b25dfaa66c51e0d882
parentdc4f5d7b382f7d5d834dc2fdf5398ef33ee39429
parent59379d74de2aa25018c9ed753188ea205beaada4
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