Ben Sander d6a2f89b21 Merge branch 'privatestaging' of https://github.com/AMDComputeLibraries/HIP-privatestaging into privatestaging ...

Conflicts:
	include/hcc_detail/trace_helper.h


[ROCm/clr commit: ba114a238f]

2016-03-29 05:56:03 -05:00

..

clr/hipamd

Merge branch 'privatestaging' of https://github.com/AMDComputeLibraries/HIP-privatestaging into privatestaging

2016-03-29 05:56:03 -05:00