| commit | 7ea721beb9e01331754268ec776df821e5e6d174 | [log] [tgz] |
|---|---|---|
| author | Alex Shi <alex.shi@linaro.org> | Tue May 12 15:16:55 2015 +0800 |
| committer | Alex Shi <alex.shi@linaro.org> | Tue May 12 15:16:55 2015 +0800 |
| tree | 134d11b24bc9da1b91780416adfc9a8df5a9009a | |
| parent | de68a339fa7899990374c4996170e0ca3e09882e [diff] | |
| parent | 1f8fdf83fe376cc83e96e942689a6cfac01e9634 [diff] |
Merge branch 'linux-linaro-lsk-v3.10' into linux-linaro-lsk-v3.10-rt Conflicts: kernel/softirq.c