projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8f57be8 b3c4b98)
Merge branch 'upstream/xen-tracing2' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <[email protected]>
Sat, 30 Jul 2011 06:33:40 +0000 (23:33 -0700)
committerLinus Torvalds <[email protected]>
Sat, 30 Jul 2011 06:33:40 +0000 (23:33 -0700)
* 'upstream/xen-tracing2' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen:
  xen/tracing: fix compile errors when tracing is disabled.

1  2 
arch/x86/xen/Makefile patch | diff1 | diff2 | blob | history

diff --cc arch/x86/xen/Makefile
Simple merge
John Crispins staging tree