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: MMI-PSA29.97-13-9~18736
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=b993fdbc7fe26f96b59003a3552c418a71aa0a9f;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.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