diff options
| author | Eric Miao <eric.miao@linaro.org> | 2011-12-14 17:19:30 +0800 |
|---|---|---|
| committer | Eric Miao <eric.miao@linaro.org> | 2011-12-14 17:19:30 +0800 |
| commit | bbc56915e53c6cb54356abcaa26123a496c78134 (patch) | |
| tree | ce7595b1ee4f3ed1c3386c74523d1a0fc336bed7 /arch/arm/plat-mxc/Makefile | |
| parent | 71b0ba808622597c36841dec3b7bb7c11701d6a1 (diff) | |
| parent | c7eb15812c072903ec9c9e9cf44328257f27b6a8 (diff) | |
Merge remote-tracking branch 'weitway/lt-3.2-imx6-display' into lt-3.2-imx6
Conflicts:
arch/arm/Kconfig
arch/arm/mach-imx/mach-imx6q.c
Diffstat (limited to 'arch/arm/plat-mxc/Makefile')
0 files changed, 0 insertions, 0 deletions