Maneesh Gupta 68b4d20b26 Merge branch 'rocm-rel-1.3' into amd-develop ...

Conflicts:
	include/hip/nvcc_detail/hip_runtime_api.h

Change-Id: I990a7d008da9e8dcc68250cebbc8ee6e723c7e01


[ROCm/clr commit: e3b5eef7c9]

2016-11-10 08:56:38 +05:30

..

hip

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

2016-11-10 08:56:38 +05:30