From: Linus Torvalds Date: Thu, 10 Dec 2009 17:35:02 +0000 (-0800) Subject: Merge branch 'bugfix' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen X-Git-Tag: v2.6.33-rc1~327 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ab1831b0b87851c874a75e4b3a8538e3d76b37d7;p=profile%2Fivi%2Fkernel-x86-ivi.git Merge branch 'bugfix' of git://git./linux/kernel/git/jeremy/xen * 'bugfix' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen: xen: try harder to balloon up under memory pressure. Xen balloon: fix totalram_pages counting. xen: explicitly create/destroy stop_machine workqueues outside suspend/resume region. xen: improve error handling in do_suspend. xen: don't leak IRQs over suspend/resume. xen: call clock resume notifier on all CPUs xen: use iret for return from 64b kernel to 32b usermode xen: don't call dpm_resume_noirq() with interrupts disabled. xen: register runstate info for boot CPU early xen: register runstate on secondary CPUs xen: register timer interrupt with IRQF_TIMER xen: correctly restore pfn_to_mfn_list_list after resume xen: restore runstate_info even if !have_vcpu_info_placement xen: re-register runstate area earlier on resume. xen: wait up to 5 minutes for device connetion xen: improvement to wait_for_devices() xen: fix is_disconnected_device/exists_disconnected_device xen/xenbus: make DEVICE_ATTR()s static --- ab1831b0b87851c874a75e4b3a8538e3d76b37d7