commit | 42ebfc61cfcb13af3e638db1c497dcbde7abfed8 | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@linux-foundation.org> | Thu Dec 15 10:52:40 2011 -0800 |
committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu Dec 15 10:52:40 2011 -0800 |
tree | a347967678d8f8a8a8ade7f37796ab62fb487308 | |
parent | 55b02d2f4445ad625213817a1736bf2884d32547 [diff] | |
parent | 63a741757d15320a25ebf5778f8651cce2ed0611 [diff] |
Merge branch 'stable/for-linus-fixes-3.2' of git://git.kernel.org/pub/scm/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.