diff options
| author | James Morris <jmorris@namei.org> | 2009-07-13 10:30:40 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2009-07-13 10:30:40 -0400 |
| commit | 7d45ecafb6792ca68da9517969d37d910601845f (patch) | |
| tree | a98b1074e5577e66a97963745f975404d0aac266 /tools/perf/util/string.h | |
| parent | be940d6279c30a2d7c4e8d1d5435f957f594d66d (diff) | |
| parent | 7638d5322bd89d49e013a03fe2afaeb6d214fabd (diff) | |
Merge branch 'master' into next
Conflicts:
include/linux/personality.h
Use Linus' version.
Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'tools/perf/util/string.h')
| -rw-r--r-- | tools/perf/util/string.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/util/string.h b/tools/perf/util/string.h index 37b03255b425..3dca2f654cd0 100644 --- a/tools/perf/util/string.h +++ b/tools/perf/util/string.h | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | #ifndef _PERF_STRING_H_ | 1 | #ifndef _PERF_STRING_H_ |
| 2 | #define _PERF_STRING_H_ | 2 | #define _PERF_STRING_H_ |
| 3 | 3 | ||
| 4 | #include "../types.h" | 4 | #include "types.h" |
| 5 | 5 | ||
| 6 | int hex2u64(const char *ptr, u64 *val); | 6 | int hex2u64(const char *ptr, u64 *val); |
| 7 | 7 | ||