diff options
| author | Ingo Molnar <mingo@kernel.org> | 2012-03-26 11:18:44 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-03-26 11:19:03 -0400 |
| commit | 7fd52392c56361a40f0c630a82b36b95ca31eac6 (patch) | |
| tree | 14091de24c6b28ea4cae9826f98aeedb7be091f5 /lib/string_helpers.c | |
| parent | b01c3a0010aabadf745f3e7fdb9cab682e0a28a2 (diff) | |
| parent | e22057c8599373e5caef0bc42bdb95d2a361ab0d (diff) | |
Merge branch 'linus' into perf/urgent
Merge reason: we need to fix a non-trivial merge conflict.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'lib/string_helpers.c')
| -rw-r--r-- | lib/string_helpers.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/string_helpers.c b/lib/string_helpers.c index ab431d4cc970..dd4ece372699 100644 --- a/lib/string_helpers.c +++ b/lib/string_helpers.c | |||
| @@ -5,7 +5,7 @@ | |||
| 5 | */ | 5 | */ |
| 6 | #include <linux/kernel.h> | 6 | #include <linux/kernel.h> |
| 7 | #include <linux/math64.h> | 7 | #include <linux/math64.h> |
| 8 | #include <linux/module.h> | 8 | #include <linux/export.h> |
| 9 | #include <linux/string_helpers.h> | 9 | #include <linux/string_helpers.h> |
| 10 | 10 | ||
| 11 | /** | 11 | /** |