| commit | b7f57fc3577b8a6822b411fa971e6562335485aa | [log] [tgz] |
|---|---|---|
| author | Alex Shi <alex.shi@linaro.org> | Thu May 21 10:09:02 2015 +0800 |
| committer | Alex Shi <alex.shi@linaro.org> | Thu May 21 10:09:02 2015 +0800 |
| tree | 9a8d5fb7fa7d049148e8799eba7327a9618249c2 | |
| parent | 7ea721beb9e01331754268ec776df821e5e6d174 [diff] | |
| parent | baf41996d83a6ecd270be42ca1870592827fb30d [diff] |
Merge branch 'linux-linaro-lsk-v3.10' into linux-linaro-lsk-v3.10-rt Conflicts: include/linux/interrupt.h