diff options
author | Andrey Konovalov <andrey.konovalov@linaro.org> | 2015-10-14 21:17:51 +0300 |
---|---|---|
committer | Andrey Konovalov <andrey.konovalov@linaro.org> | 2015-10-14 21:17:51 +0300 |
commit | 4e6906b531c41d40f1fd9f48febce5eefdbe025f (patch) | |
tree | 297b1345f73007b3a2b7a1256e8482a1d4d903bb /arch/arm/mach-omap2/common.h | |
parent | fb8d4e20361d821adb8828758f7794f6305e837d (diff) | |
parent | 52bddd7cb59adbc9ce56ebd03ad63936cf7cd1e5 (diff) |
Automatically merging tracking-integration-linux-qcomlt into merge-linux-linaroll-20151014.0ll_20151014.0
Conflicting files:
Diffstat (limited to 'arch/arm/mach-omap2/common.h')
0 files changed, 0 insertions, 0 deletions