summaryrefslogtreecommitdiffstats
path: root/arch/arm/common
diff options
context:
space:
mode:
authorLinus Torvalds2011-07-30 08:33:40 +0200
committerLinus Torvalds2011-07-30 08:33:40 +0200
commitb993fdbc7fe26f96b59003a3552c418a71aa0a9f (patch)
treed5ffe93095c2111b7a68e1f0cc0b2f6e2388e990 /arch/arm/common
parentMerge branch 'at91/cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/... (diff)
parentxen/tracing: fix compile errors when tracing is disabled. (diff)
downloadkernel-qcow2-linux-b993fdbc7fe26f96b59003a3552c418a71aa0a9f.tar.gz
kernel-qcow2-linux-b993fdbc7fe26f96b59003a3552c418a71aa0a9f.tar.xz
kernel-qcow2-linux-b993fdbc7fe26f96b59003a3552c418a71aa0a9f.zip
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/common')
0 files changed, 0 insertions, 0 deletions