]> nv-tegra.nvidia Code Review - linux-2.6.git/commit
Merge branch 'upstream/xen-tracing2' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 30 Jul 2011 06:33:40 +0000 (23:33 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 30 Jul 2011 06:33:40 +0000 (23:33 -0700)
commitb993fdbc7fe26f96b59003a3552c418a71aa0a9f
treed5ffe93095c2111b7a68e1f0cc0b2f6e2388e990
parent8f57be8ee44d92ef161c5af685aedbb717db96e0
parentb3c4b9825075b680817b9460184e7b576dc97597
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.
arch/x86/xen/Makefile