| commit | 5eef150c1d7e41baaefd00dd56c153debcd86aee | |
| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Tue, 25 Oct 2011 07:17:07 +0000 (25 09:17 +0200) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Tue, 25 Oct 2011 07:17:07 +0000 (25 09:17 +0200) | ||
| tree | 612723d8b0930ba8c6292cd317231249713c1877 | treesnapshot (tar.gz zip) |
| parent | 315eb8a2a1b7f335d40ceeeb11b9e067475eb881 | commitdiff |
| parent | f3f436e33b925ead21e3f9b47b1e2aed965511d9 | commitdiff |
Merge branch 'stable/e820-3.2' of git://git./linux/kernel/git/konrad/xen
* 'stable/e820-3.2' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
xen: release all pages within 1-1 p2m mappings
xen: allow extra memory to be in multiple regions
xen: allow balloon driver to use more than one memory region
xen/balloon: simplify test for the end of usable RAM
xen/balloon: account for pages released during memory setup
* 'stable/e820-3.2' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
xen: release all pages within 1-1 p2m mappings
xen: allow extra memory to be in multiple regions
xen: allow balloon driver to use more than one memory region
xen/balloon: simplify test for the end of usable RAM
xen/balloon: account for pages released during memory setup