Ben Sander dd323f5e31 Merge branch 'privatestaging' into p2p ...

Conflicts:
	include/hcc_detail/hip_hcc.h
	src/hip_hcc.cpp


[ROCm/clr commit: 8d26dfcde3]

2016-04-17 06:46:52 -05:00

..

clr/hipamd

Merge branch 'privatestaging' into p2p

2016-04-17 06:46:52 -05:00