From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 3 Dec 2010 18:08:52 +0000 (-0800)
Subject: Merge branches 'upstream/core' and 'upstream/bugfix' of git://git.kernel.org/pub... 
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=8338fded137681bc3c1e99a69ac937a4fb016fe4;p=openwrt%2Fstaging%2Fblogic.git

Merge branches 'upstream/core' and 'upstream/bugfix' of git://git./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
---

8338fded137681bc3c1e99a69ac937a4fb016fe4