diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-19 16:14:35 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-19 16:14:35 -0700 |
| commit | 3bfccb74973db10a03d3d4c1d10fc00e77145699 (patch) | |
| tree | c10ff2c8c9e36f509c46859e0391c08764293f16 /arch | |
| parent | 5318991645d78c83dde7a7bb1cba24695cc152c4 (diff) | |
| parent | 09ca132a8e469f87504899b4016c7517511887d0 (diff) | |
| parent | 887cb45694f77d59de19674cb73146fec72fadbb (diff) | |
| download | linux-3bfccb74973db10a03d3d4c1d10fc00e77145699.tar.bz2 | |
Merge branches 'stable/balloon.cleanup' and 'stable/general.cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen
* 'stable/balloon.cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
xen/balloon: Move dec_totalhigh_pages() from __balloon_append() to balloon_append()
xen/balloon: Clarify credit calculation
xen/balloon: Simplify HVM integration
xen/balloon: Use PageHighMem() for high memory page detection
* 'stable/general.cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
drivers/xen/sys-hypervisor: Cleanup code/data sections definitions
arch/x86/xen/smp: Cleanup code/data sections definitions
arch/x86/xen/time: Cleanup code/data sections definitions
arch/x86/xen/xen-ops: Cleanup code/data sections definitions
arch/x86/xen/mmu: Cleanup code/data sections definitions
arch/x86/xen/setup: Cleanup code/data sections definitions
arch/x86/xen/enlighten: Cleanup code/data sections definitions
arch/x86/xen/irq: Cleanup code/data sections definitions
xen: tidy up whitespace in drivers/xen/Makefile