Merge branch 'amd-develop' into amd-master

Change-Id: I53d5a8916d769c4f0fe60d2ee3b240551da80b4f
(cherry picked from commit 60093c286f)


[ROCm/hip commit: bb8c51a129]
This commit is contained in:
Maneesh Gupta authored and Maneesh Gupta committed 2017-04-07 11:10:59 -05:00
1 förälder e27e3d111a
incheckning 8f4dc83926
23 files changed
+451 -214

No files matched your search

@@ -11,7 +11,6 @@
#include <elf.h>
#include <hsa/hsa.h>
#include <hc.hpp>
#include <hip/hcc_detail/hcc_acc.h>
#endif
#include <sys/time.h>