diff options
| author | Tushar Behera <tushar.behera@linaro.org> | 2013-05-15 12:12:18 +0530 |
|---|---|---|
| committer | John Stultz <john.stultz@linaro.org> | 2013-05-15 12:33:54 -0700 |
| commit | cd432fc233f4e7aba43b4fe499a4445f0f6ee1c6 (patch) | |
| tree | bfd78aba229f3d26ccea1640d9f35362224d910d /include/linux/ftrace.h | |
| parent | 4d591afac92816892ace872dd68eb23c4545711f (diff) | |
Fix merge error w.r.t. printk
While merging Android tree for v3.10-rc1, these lines got deleted
resulting in a build error.
Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
Signed-off-by: John Stultz <john.stultz@linaro.org>
Diffstat (limited to 'include/linux/ftrace.h')
0 files changed, 0 insertions, 0 deletions