Merge remote-tracking branch 'origin/master'

Conflicts:
	posts/nvtx/compiler_inst_nvtx.cu
	posts/nvtx/inst_nvtx.cpp
	posts/nvtx/manual_nvtx.cu

Author: harrism

posts/nvtx/compiler_inst_nvtx.cu

@@ -1,5 +1,5 @@
-/* Copyright (c) 1993-2015, NVIDIA CORPORATION. All rights reserved.
- *
+/* Copyright (c) 2014, NVIDIA CORPORATION. All rights reserved.
+ * 
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -25,7 +25,6 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-
 #include <cstdio>
 
 __global__ void init_data_kernel( int n, double* x)

posts/nvtx/inst_nvtx.cpp

@@ -1,5 +1,5 @@
-/* Copyright (c) 1993-2015, NVIDIA CORPORATION. All rights reserved.
- *
+/* Copyright (c) 2014, NVIDIA CORPORATION. All rights reserved.
+ * 
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -25,7 +25,6 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-
 #include <stdio.h>
 #include "nvToolsExt.h"
 #include <dlfcn.h>

posts/nvtx/manual_nvtx.cu

@@ -1,5 +1,5 @@
-/* Copyright (c) 1993-2015, NVIDIA CORPORATION. All rights reserved.
- *
+/* Copyright (c) 2014, NVIDIA CORPORATION. All rights reserved.
+ * 
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met: