From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 30 Jul 2011 06:33:40 +0000 (-0700)
Subject: Merge branch 'upstream/xen-tracing2' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: firefly_0821_release~3680^2~4815
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=b993fdbc7fe26f96b59003a3552c418a71aa0a9f;p=firefly-linux-kernel-4.4.55.git

Merge branch 'upstream/xen-tracing2' of git://git./linux/kernel/git/jeremy/xen

* 'upstream/xen-tracing2' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen:
  xen/tracing: fix compile errors when tracing is disabled.
---

b993fdbc7fe26f96b59003a3552c418a71aa0a9f