]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'stable/bug.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 20 Jun 2011 16:01:33 +0000 (09:01 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 20 Jun 2011 16:01:33 +0000 (09:01 -0700)
commit6df244ce58151be63fca63223d69c6bed52bedb0
treee0e540f992aae6dfd3bfa1f8de42461ac1656c1a
parent4cddb5a6647e459d630988f9f573a879e48d0f7f
parentf29fd45efd21dce31541a93a28f08ab9e9985d81
Merge branch 'stable/bug.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen

* 'stable/bug.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
  xen/setup: Fix for incorrect xen_extra_mem_start.
  xen: When calling power_off, don't call the halt function.
  xen: Fix compile warning when CONFIG_SMP is not defined.
  xen: support CONFIG_MAXSMP
  xen: partially revert "xen: set max_pfn_mapped to the last pfn mapped"