tree 66e900e301d0e2f5769acb1ee1c89efd4ef539e5
parent 20b2f1ac85207bfea397e2fdb34cb4b3515ad919
parent 1b6dc1e478c85e6028ce3a918d484ecbcd52173e
author Kevin Hilman <khilman@linaro.org> 1382103393 -0700
committer Kevin Hilman <khilman@linaro.org> 1382103393 -0700
mergetag object 1b6dc1e478c85e6028ce3a918d484ecbcd52173e
 type commit
 tag v3.13-rockchip-fixes
 tagger Heiko Stuebner <heiko@sntech.de> 1382036021 +0200
 
 Romoval of obsolete (never used) dt properties
 and fix for the selection of the TWD.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.12 (GNU/Linux)
 
 iQEcBAABCAAGBQJSYDcLAAoJEPOmecmc0R2Bsk8IAJYlUERribDudz9RwlG5M9ml
 51VZqJfvc1h0odPS0FnuB+qc2SA4zzqfwWFmqDfBA1XttlC800TAFA9c3zcrqIKt
 saJdEnnV1DiCJxhayxDhARIuCQI3pQj/2b88sFrkf3EQZRCoXrpehJpvQrZRYqUn
 /Za7cbl5Krzvr9G33P5kIORdkNxxY7kygXmoEK6jsDxJmIuB9wIgHMz9SfavxGhH
 y0EfyXFJ093jrAOrs5oTxd7FB/Tb2Y4N81moZUxKTKGfv6hrVeBOhfJbrbTLvrP+
 ZgjmBpgZrn0bn3tox1b8ZCa9ZDJbYipZF+MkHzhXhTYMrqPIS2Ht9aSUZWORRHU=
 =0kg9
 -----END PGP SIGNATURE-----

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