]> xenbits.xensource.com Git - people/ssmith/netchannel2-pvops.bak.git/.git/commitdiff
Merge branch 'xen-tip/core' into xen-tip/next
authorJeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Fri, 8 May 2009 22:39:48 +0000 (15:39 -0700)
committerJeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Fri, 8 May 2009 22:39:48 +0000 (15:39 -0700)
* xen-tip/core:
  xen: special-case stack_segment traps too

1  2 
arch/x86/include/asm/traps.h
arch/x86/kernel/entry_64.S
arch/x86/xen/enlighten.c

Simple merge
Simple merge
Simple merge