pensun cb19da0aa7 resolve conflicts of doc_update ...

[ROCm/hip commit: 11ca71bd76]

2016-02-27 15:08:45 -06:00

..

hip

resolve conflicts of doc_update

2016-02-27 15:08:45 -06:00