From: Linus Torvalds Date: Sat, 6 Aug 2011 19:22:30 +0000 (-0700) Subject: Merge branch 'stable/bug.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git... X-Git-Tag: v6.6-pxa1908~29699 X-Git-Url: https://git.dujemihanovic.xyz/?a=commitdiff_plain;h=45a05f9488911851f7a5c536df80b41f0105caf0;p=linux.git 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 --- 45a05f9488911851f7a5c536df80b41f0105caf0