Merge branch 'for-pierre-marc' of git://git.infradead.org/users/jblunck/ust
authorPierre-Marc Fournier <pierre-marc.fournier@polymtl.ca>
Tue, 27 Oct 2009 22:58:15 +0000 (18:58 -0400)
committerPierre-Marc Fournier <pierre-marc.fournier@polymtl.ca>
Tue, 27 Oct 2009 22:58:15 +0000 (18:58 -0400)
commitaa08b4413291fabcbd1b1144377d37034ad361de
treee3828fd091af6abc0c85c3aa794c2664f4e7ffbc
parent12bb5a5f4eb614c4be28e862b9d78603b4626e46
parentfbca6b624335eef18c8d86194aeb101a720168f4
Merge branch 'for-pierre-marc' of git://git.infradead.org/users/jblunck/ust

Fixed conflicts:
include/ust/marker.h
include/ust/marker.h
libust/marker.c
libust/serialize.c
libust/tracectl.c
libust/tracer.h
ustd/ustd.c
This page took 0.024951 seconds and 4 git commands to generate.