diff options
| author | Anders Roxell <anders.roxell@linaro.org> | 2014-07-30 17:29:17 +0200 |
|---|---|---|
| committer | Anders Roxell <anders.roxell@linaro.org> | 2014-07-30 17:29:17 +0200 |
| commit | 37febd5a068f9fc73e5b91f7eacecb66293fc962 (patch) | |
| tree | edf287adc99cb7e85c4ba1243a912e7dfd52b4fe /include | |
| parent | b8242e24ae4142f543ea25b19331a0e211b18156 (diff) | |
| parent | c546f75426e99b7f7bbbf33350504179e6f84e14 (diff) | |
Merge branch 'v3.14-rt' into linux-linaro-lsk-v3.14-rt
Signed-off-by: Anders Roxell <anders.roxell@linaro.org>
Conflicts:
kernel/Kconfig.locks
kernel/trace/trace.c
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions