Merge branch 'stable/for-linus-fixes-3.2' of git://git.kernel.org/pub/scm/linux/kerne...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 15 Dec 2011 18:52:40 +0000 (10:52 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 15 Dec 2011 18:52:40 +0000 (10:52 -0800)
commit42ebfc61cfcb13af3e638db1c497dcbde7abfed8
treea347967678d8f8a8a8ade7f37796ab62fb487308
parent55b02d2f4445ad625213817a1736bf2884d32547
parent63a741757d15320a25ebf5778f8651cce2ed0611
Merge branch 'stable/for-linus-fixes-3.2' of git://git./linux/kernel/git/konrad/xen

* 'stable/for-linus-fixes-3.2' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
  xen/swiotlb: Use page alignment for early buffer allocation.
  xen: only limit memory map to maximum reservation for domain 0.
arch/x86/xen/setup.c