Ben Sander 262b69f387 Merge branch 'privatestaging' into p2p ...

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


[ROCm/hip commit: 49cc5aec91]

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

..

hip

Merge branch 'privatestaging' into p2p

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