tree 9699d60dc3b21e9fc7782af93aefdd334cfc46b7
parent fb6f3d69af95006c0518be7fbcd73bff555c837d
parent 1b90e06b14291ce3c252bd10e4ce981a08152e2e
author Olof Johansson <olof@lixom.net> 1348345449 -0700
committer Olof Johansson <olof@lixom.net> 1348345449 -0700

Merge branch 'kirkwood/dt' of git://git.infradead.org/users/jcooper/linux into late/kirkwood

From Jason Cooper:

New bindings:
  - iconnect nand and keys
  - mv_cesa
  - gpio-fan

* 'kirkwood/dt' of git://git.infradead.org/users/jcooper/linux:
  ARM: kirkwood: Use devicetree to define DNS-32[05] fan
  hwmon: Add devicetree bindings to gpio-fan
  Crypto: CESA: Add support for DT based instantiation.
  ARM: Kirkwood: Describe iconnect nand in DT.
  ARM: Kirkwood: Describe iconnect keys in DT.