diff options
| author | Jon Medhurst <tixy@linaro.org> | 2014-04-04 18:06:14 +0100 |
|---|---|---|
| committer | Jon Medhurst <tixy@linaro.org> | 2014-04-04 18:06:14 +0100 |
| commit | e2b3af931b0a301650aa697e49b222168568642f (patch) | |
| tree | 76ca02ca6aafc82c91431f91e1faf43106076e19 /drivers/misc/Makefile | |
| parent | 72fc166b8bb56df97827852d559b29f2f89b4faf (diff) | |
| parent | 052a2ba5dbbb3268ac0524ad73e9b8a845606e69 (diff) | |
Merge branch 'tracking-armlt-config64' into integration-linaro-vexpress
Conflicts:
linaro/configs/vexpress64.conf
Diffstat (limited to 'drivers/misc/Makefile')
0 files changed, 0 insertions, 0 deletions