From: Rusty Russell Date: Thu, 31 Jan 2008 07:00:47 +0000 (+1100) Subject: lguest: fix mis-merge against hpa's TSS renaming X-Git-Tag: v2.6.25-rc1~1129 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e95035c61a4c3dae1aa543a5bf5b39846daca061;p=pandora-kernel.git lguest: fix mis-merge against hpa's TSS renaming drivers/lguest/x86/core.c: In function ‘copy_in_guest_info’: drivers/lguest/x86/core.c:97: error: ‘struct x86_hw_tss’ has no member named ‘esp1’ Signed-off-by: Rusty Russell Signed-off-by: Linus Torvalds --- Reading git-diff-tree failed