Messages in this thread | | | Date | Tue, 09 Aug 2011 15:41:18 -0500 | From | "H. Peter Anvin" <> | Subject | Re: [tip:x86/trampoline] x86, suspend: Merge 32- and 64-bit realmode wakeup code |
| |
On 08/09/2011 02:34 PM, matthieu castet wrote: > Note that > https://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commitdiff;h=7a3136666bc0f0419f7aaa7b1fabb4b0e0a7fb76 > should be reverted for applying the patch. > > This is not a problem as the x86_32 trampoline code already does that. > > Any idea when it will be merged in the mainline tree ? >
3.2 merge window, unless something goes wrong.
-hpa
| |