tree 7ca5fd476ef71cab2064d716046be4cc281f918b
parent 20cbc972617069c1ed434f62151e4de57d26ea46
parent a1716d508abf77e4bd02c275ab9293b9866929f3
author Linus Torvalds <torvalds@linux-foundation.org> 1215288518 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1215288518 -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 resume from suspend to RAM on uniprocessor x86-64
  x86 ACPI: normalize segment descriptor register on resume