]> 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)
commit294ad3973180e91b481e4248f82fefe2e27957bc
treed5ffe93095c2111b7a68e1f0cc0b2f6e2388e990
parentd3166f93d08639bc562f3db4ffe6cbe6ffc7a625
parent93664a3cafa935c3f83d8b350f5aee78e0652cea
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