Merge branch 'rocm-rel-1.3' into amd-develop

Conflicts: include/hip/nvcc_detail/hip_runtime_api.h Change-Id: I990a7d008da9e8dcc68250cebbc8ee6e723c7e01
2016-11-10 08:56:20 +05:30
parent 57cd3c8244 7c68768a0d
commit 72c722c3d6
4 changed files with 26 additions and 3 deletions
@@ -654,7 +654,6 @@ inline hipError_t hipProfilerStop()
    return hipCUDAErrorTohipError(cudaProfilerStop());
 }

-
 inline static hipError_t hipSetDeviceFlags (unsigned int flags)
 {
    return hipCUDAErrorTohipError(cudaSetDeviceFlags(flags));