diff options
| author | Steven Rostedt (Red Hat) <rostedt@goodmis.org> | 2015-03-11 21:51:28 -0400 |
|---|---|---|
| committer | Anders Roxell <anders.roxell@linaro.org> | 2015-03-24 14:12:10 +0100 |
| commit | 68bb25c3df8a94edccb57e52c4d5f43a693817a4 (patch) | |
| tree | 1033d678c6f337c3157644ff5a8b921d3a84a5fa | |
| parent | ea31c9928be7889a300a016c5cb8c411a9f9fab1 (diff) | |
Linux 3.14.36-rt34 REBASE
Conflicts:
localversion-rt
| -rw-r--r-- | localversion-rt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/localversion-rt b/localversion-rt index ce6a482618d5..21988f9ad53f 100644 --- a/localversion-rt +++ b/localversion-rt @@ -1 +1 @@ --rt32 +-rt34 |