| commit | 537388bb6563bfde7c0307b95ecc1f7a1ae39b02 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Sat Jul 05 13:08:38 2008 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Sat Jul 05 13:08:38 2008 -0700 |
| tree | 7ca5fd476ef71cab2064d716046be4cc281f918b | |
| parent | 20cbc972617069c1ed434f62151e4de57d26ea46 [diff] | |
| parent | a1716d508abf77e4bd02c275ab9293b9866929f3 [diff] |
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