Merge branch 'dmaengine' into async-tx-next

Conflicts:
	crypto/async_tx/async_xor.c
	drivers/dma/ioat/dma_v2.h
	drivers/dma/ioat/pci.c
	drivers/md/raid5.c

1 files changed, 8 insertions, 0 deletions

diff --git a/tools/perf/util/string.h b/tools/perf/util/string.h
new file mode 100644
index 00000000000..37b03255b42
--- /dev/null
+++ b/tools/perf/util/string.h
@@ -0,0 +1,8 @@
+#ifndef _PERF_STRING_H_
+#define _PERF_STRING_H_
+
+#include "../types.h"
+
+int hex2u64(const char *ptr, u64 *val);
+
+#endif