]> git.openfabrics.org - ~shefty/rdma-dev.git/commitdiff
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)
* '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.

1  2 
arch/x86/xen/setup.c

Simple merge