diff options
| author | Kevin Hilman <khilman@linaro.org> | 2013-10-18 06:36:33 -0700 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2013-10-18 06:36:33 -0700 |
| commit | 80a18f5043123e48198c7b2f3a9484a115d3c73b (patch) | |
| tree | 66e900e301d0e2f5769acb1ee1c89efd4ef539e5 /arch/arm/configs/em_x270_defconfig | |
| parent | 20b2f1ac85207bfea397e2fdb34cb4b3515ad919 (diff) | |
| parent | 1b6dc1e478c85e6028ce3a918d484ecbcd52173e (diff) | |
Merge tag 'v3.13-rockchip-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into fixes-non-critical
From Heiko Stübner:
Romoval of obsolete (never used) dt properties
and fix for the selection of the TWD.
* tag 'v3.13-rockchip-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
ARM: rockchip: remove obsolete rockchip,config properties
ARM: rockchip: fix wrong use of non-existent CONFIG_LOCAL_TIMERS
Diffstat (limited to 'arch/arm/configs/em_x270_defconfig')
0 files changed, 0 insertions, 0 deletions