tree e530376dbaf3581590e8e5d99cf35df5732bee44
parent f38092b50f6e68d046ada7d2a4b3ecbbeab29fb4
parent c00c8aa2d976e9ed1d12a57b42d6e9b27efb7abe
author Linus Torvalds <torvalds@linux-foundation.org> 1312658550 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1312658550 -0700

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

* 'stable/bug.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
  xen/trace: Fix compile error when CONFIG_XEN_PRIVILEGED_GUEST is not set
  xen: Fix misleading WARN message at xen_release_chunk
  xen: Fix printk() format in xen/setup.c
  xen/tracing: it looks like we wanted CONFIG_FTRACE
  xen/self-balloon: Add dependency on tmem.
  xen/balloon: Fix compile errors - missing header files.
  xen/grant: Fix compile warning.
  xen/pciback: remove duplicated #include