diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-02-24 12:33:52 -0800 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-02-24 12:33:52 -0800 |
commit | b42060069faa0daf7915acec4f31e4a46bca3b32 (patch) | |
tree | e403a7948aedea5897fd3118da0ff1c9926690a7 /arch/parisc/kernel/ftrace.c | |
parent | aa256f8d0dd9c2dff872849418d8e09e5d06718f (diff) | |
parent | cfbf8d4857c26a8a307fb7cd258074c9dcd8c691 (diff) |
Merge 3.14-rc4 into staging-next.
We want those fixes here as well.
Diffstat (limited to 'arch/parisc/kernel/ftrace.c')
0 files changed, 0 insertions, 0 deletions