diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-29 23:33:40 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-29 23:33:40 -0700 |
| commit | b993fdbc7fe26f96b59003a3552c418a71aa0a9f (patch) | |
| tree | d5ffe93095c2111b7a68e1f0cc0b2f6e2388e990 /arch/arm/mach-iop33x | |
| parent | Merge branch 'at91/cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc (diff) | |
| parent | xen/tracing: fix compile errors when tracing is disabled. (diff) | |
| download | linux-dev-b993fdbc7fe26f96b59003a3552c418a71aa0a9f.tar.xz linux-dev-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/mach-iop33x')
0 files changed, 0 insertions, 0 deletions