From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 30 Jul 2011 06:43:32 +0000 (-0700)
Subject: Merge branch 'stable/bug.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: tegra-l4t-r15-er2~4137
X-Git-Url: https://nv-tegra.nvidia.com/r/gitweb?p=linux-2.6.git;a=commitdiff_plain;h=c32e7d669ef827f97d1aae8f6b34542665defbf6

Merge branch 'stable/bug.fixes' of git://git./linux/kernel/git/konrad/xen

* 'stable/bug.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
  xen/balloon: Fix compile errors - missing header files.
  xen/grant: Fix compile warning.
  xen/pciback: remove duplicated #include
---

c32e7d669ef827f97d1aae8f6b34542665defbf6