diff options
| author | John Stultz <john.stultz@linaro.org> | 2013-05-21 10:12:15 -0700 |
|---|---|---|
| committer | John Stultz <john.stultz@linaro.org> | 2013-05-21 10:12:15 -0700 |
| commit | 149891b20608f4cbd062d90fa1aca3b2b19e1066 (patch) | |
| tree | d5c5f3da7d5307c0bfdd48523463967ffcaf8760 /kernel/trace/trace.c | |
| parent | 15a6affec4449b54afba15ab7edbad0cac2736d3 (diff) | |
| parent | 1da455354b4a8ff3bc9c5f66f5a174b13e179ae6 (diff) | |
Merge branch 'linaro-fixes/experimental/android-3.9' into linaro-android-3.10-experimental-mergetracking-linaro-android-3.10-llct-20130521.0
Conflicts:
kernel/printk.c
Diffstat (limited to 'kernel/trace/trace.c')
0 files changed, 0 insertions, 0 deletions