summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-12-03 10:08:52 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2010-12-03 10:08:52 -0800
commit8338fded137681bc3c1e99a69ac937a4fb016fe4 (patch)
tree0d70ae6b1e9f07b2065ec6eb2abc882c89bd20ff /drivers
parent9cd6315357eccb768d9062cb43e3dc741e922020 (diff)
parent29dcbc5c25d6d8140337e96bf503c8475092c586 (diff)
parent805e3f495057aa5307ad4e3d6dc7073d4733c691 (diff)
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