Merge branch 'memtracker' into privatestaging

Conflicts:
	include/nvcc_detail/hip_runtime_api.h
This commit is contained in:
Ben Sander
2016-02-26 06:17:05 -06:00
7 ha cambiato i file con 236 aggiunte e 13 eliminazioni
+2
Vedi File
@@ -1227,6 +1227,8 @@ hipError_t hipDeviceReset(void)
}
#endif
// TODO - reset all streams on the device.
return ihipLogStatus(hipSuccess);
}