Merge branch 'master' into benchmark

Signed-off-by: David Goulet <dgoulet@efficios.com>

diff --cc Makefile.am
index b6c5a7a0d25bd3425f8a1b456c274c4398cdef2f,831ac9d29eca4dbb22470ef49925c94695eee8b3..bab695466d212894d07d9416e20bfda017e67342
--- 1/Makefile.am
--- 2/Makefile.am
+++ b/Makefile.am
@@@ -7,5 -5,4 +7,7 @@@ SUBDIRS = src/common/ 
                  include \
                  doc
  
 +bench:
 +      ./benchmark/runall.sh
++
+ dist_doc_DATA = ChangeLog

diff --cc configure.ac
index bd65c55ee24b033f0595a9d9a77ff25c8f8c23f3,ffd54e2e6a7b017ed66b76ee74aff7dbfde748f8..0a1cc319c7a3fc474f1d3d116798f004685d9115
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -137,8 -150,8 +155,9 @@@ AC_SUBST(DEFAULT_INCLUDES
  AC_CONFIG_FILES([
        Makefile
        doc/Makefile
+       doc/man/Makefile
        include/Makefile
 +      benchmark/Makefile
        src/Makefile
        src/common/Makefile
        src/common/kernel-ctl/Makefile

diff --cc src/bin/lttng-sessiond/main.c
Simple merge