]> git.openfabrics.org - ~shefty/rdma-dev.git/commit
Merge branches 'upstream/core' and 'upstream/bugfix' of git://git.kernel.org/pub...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 3 Dec 2010 18:08:52 +0000 (10:08 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 3 Dec 2010 18:08:52 +0000 (10:08 -0800)
commit8338fded137681bc3c1e99a69ac937a4fb016fe4
tree0d70ae6b1e9f07b2065ec6eb2abc882c89bd20ff
parent9cd6315357eccb768d9062cb43e3dc741e922020
parent29dcbc5c25d6d8140337e96bf503c8475092c586
parent805e3f495057aa5307ad4e3d6dc7073d4733c691
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
arch/x86/xen/enlighten.c
arch/x86/xen/setup.c