| commit | 3709a1288a2c2d300a560ba24d70410a0dfb25c5 | [log] [tgz] |
|---|---|---|
| author | Alex Shi <alex.shi@linaro.org> | Tue Jul 29 15:24:48 2014 +0800 |
| committer | Alex Shi <alex.shi@linaro.org> | Tue Jul 29 15:24:48 2014 +0800 |
| tree | 0769a9ead1d83b1fe737d643f6b9827988f0746b | |
| parent | 2764df8715cc5570e96780e7b9e516002069e486 [diff] | |
| parent | 77917ecac9c37f9f02e7954b617df8f824894778 [diff] |
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-rt Conflicts: arch/x86/Kconfig kernel/Kconfig.locks kernel/trace/trace.c