| commit | 1f0324caefd39985e9fe052fac97da31694db31e | |
| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Fri, 28 Jan 2011 02:24:34 +0000 (28 12:24 +1000) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Fri, 28 Jan 2011 02:24:34 +0000 (28 12:24 +1000) | ||
| tree | 1be0e2ac86c404273159570bf302ffe040869d85 | treesnapshot (tar.gz zip) |
| parent | 0b6bb66d1247601e4a2560bb048d64c606bd7b73 | commitdiff |
| parent | 23febeddbe67e5160929f7c48f7bfe83c2eecb99 | commitdiff |
Merge branch 'stable/bug-fixes-rc2' of git://git./linux/kernel/git/konrad/xen
* 'stable/bug-fixes-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
xen/setup: Route halt operations to safe_halt pvop.
xen/e820: Guard against E820_RAM not having page-aligned size or start.
xen/p2m: Mark INVALID_P2M_ENTRY the mfn_list past max_pfn.
* 'stable/bug-fixes-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
xen/setup: Route halt operations to safe_halt pvop.
xen/e820: Guard against E820_RAM not having page-aligned size or start.
xen/p2m: Mark INVALID_P2M_ENTRY the mfn_list past max_pfn.