| commit | b993fdbc7fe26f96b59003a3552c418a71aa0a9f | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Jul 29 23:33:40 2011 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Jul 29 23:33:40 2011 -0700 |
| tree | d5ffe93095c2111b7a68e1f0cc0b2f6e2388e990 | |
| parent | 8f57be8ee44d92ef161c5af685aedbb717db96e0 [diff] | |
| parent | b3c4b9825075b680817b9460184e7b576dc97597 [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.