]> git.baikalelectronics.ru Git - kernel.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)
commitd2990bfaddf0e6d57314e32fa28a3c29e3c9ddb9
treed5ffe93095c2111b7a68e1f0cc0b2f6e2388e990
parenteefd98a924b4b01badd02e8540da2309e9f1c93c
parent52a65aa6378e06d495610c9e04b0092f93465044
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.
arch/x86/xen/Makefile