From: Olof Johansson <olof@lixom.net>
Date: Sat, 22 Sep 2012 20:24:09 +0000 (-0700)
Subject: Merge branch 'kirkwood/dt' of git://git.infradead.org/users/jcooper/linux into late... 
X-Git-Tag: v3.7-rc1~99^2^2~6
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=d6a93ceb3f523be3a00b5ee8c6380653c764927b;p=linux.git

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.
---

d6a93ceb3f523be3a00b5ee8c6380653c764927b