]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branches 'stable/balloon.cleanup' and 'stable/general.cleanup' of git://git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 19 May 2011 23:14:35 +0000 (16:14 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 19 May 2011 23:14:35 +0000 (16:14 -0700)
commit531bd2545797f6c1d11b421b4d57247f6a75a6cc
treec10ff2c8c9e36f509c46859e0391c08764293f16
parenta3abbd9e882b5205c0e611d51ded96ddd201a924
parent49764b9bc2fec4e597732ef617a08ced2d758e8b
parentd7c9f31c10e8a66f8d93fada6599de0bbaea8567
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