summaryrefslogtreecommitdiff
path: root/arch/arm/mach-cns3xxx
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-07-29 23:33:40 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-07-29 23:33:40 -0700
commitb993fdbc7fe26f96b59003a3552c418a71aa0a9f (patch)
treed5ffe93095c2111b7a68e1f0cc0b2f6e2388e990 /arch/arm/mach-cns3xxx
parent8f57be8ee44d92ef161c5af685aedbb717db96e0 (diff)
parentb3c4b9825075b680817b9460184e7b576dc97597 (diff)
Merge branch 'upstream/xen-tracing2' of git://git.kernel.org/pub/scm/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.
Diffstat (limited to 'arch/arm/mach-cns3xxx')
0 files changed, 0 insertions, 0 deletions