summaryrefslogtreecommitdiffstats
path: root/arch/x86/xen
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-12-03 19:08:52 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2010-12-03 19:08:52 +0100
commit8338fded137681bc3c1e99a69ac937a4fb016fe4 (patch)
tree0d70ae6b1e9f07b2065ec6eb2abc882c89bd20ff /arch/x86/xen
parentMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiw... (diff)
parentxen: allocate irq descs on any NUMA node (diff)
parentxen: x86/32: perform initial startup on initial_page_table (diff)
downloadlinux-8338fded137681bc3c1e99a69ac937a4fb016fe4.tar.xz
linux-8338fded137681bc3c1e99a69ac937a4fb016fe4.zip
Merge branches 'upstream/core' and 'upstream/bugfix' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen
* 'upstream/core' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen: xen: allocate irq descs on any NUMA node xen: prevent crashes with non-HIGHMEM 32-bit kernels with largeish memory xen: use default_idle xen: clean up "extra" memory handling some more * 'upstream/bugfix' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen: xen: x86/32: perform initial startup on initial_page_table xen: don't bother to stop other cpus on shutdown/reboot