Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 5 Jul 2008 20:08:38 +0000 (13:08 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 5 Jul 2008 20:08:38 +0000 (13:08 -0700)
commit537388bb6563bfde7c0307b95ecc1f7a1ae39b02
tree7ca5fd476ef71cab2064d716046be4cc281f918b
parent20cbc972617069c1ed434f62151e4de57d26ea46
parenta1716d508abf77e4bd02c275ab9293b9866929f3
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 ACPI: fix resume from suspend to RAM on uniprocessor x86-64
  x86 ACPI: normalize segment descriptor register on resume