]> xenbits.xensource.com Git - people/ssmith/netchannel2-pvops.git/commitdiff
Merge branch 'rebase/dom0/acpi' into rebase/master
authorJeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Thu, 3 Sep 2009 23:05:46 +0000 (16:05 -0700)
committerJeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Thu, 3 Sep 2009 23:05:46 +0000 (16:05 -0700)
* rebase/dom0/acpi:
  Fix the host S3 resume hang

1  2 
arch/x86/kernel/apic/io_apic.c

Simple merge