Ben Sander e345f23846 Merge branch 'memtracker' into privatestaging ...

Conflicts:
	include/nvcc_detail/hip_runtime_api.h


[ROCm/clr commit: 7a1b4c3878]

2016-02-26 06:17:05 -06:00

..

hip_hcc.cpp

Merge branch 'memtracker' into privatestaging

2016-02-26 06:17:05 -06:00