projects / profile / ivi / kernel-x86-ivi.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9cd6315 29dcbc5 805e3f4)
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)
* '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

1  2  3 
arch/x86/xen/enlighten.c patch | diff1 | diff2 | diff3 | blob | history
arch/x86/xen/setup.c patch | diff1 | diff2 | diff3 | blob | history

diff --cc arch/x86/xen/enlighten.c
Simple merge
diff --cc arch/x86/xen/setup.c
Simple merge
Domain: System / Uncategorized;