From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 19 May 2011 23:14:35 +0000 (-0700)
Subject: Merge branches 'stable/balloon.cleanup' and 'stable/general.cleanup' of git://git... 
X-Git-Tag: v3.0-rc1~414
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3bfccb74973db10a03d3d4c1d10fc00e77145699;p=platform%2Fkernel%2Flinux-3.10.git

Merge branches 'stable/balloon.cleanup' and 'stable/general.cleanup' of git://git./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
---

3bfccb74973db10a03d3d4c1d10fc00e77145699