diff options
author | Olof Johansson <olof@lixom.net> | 2012-09-22 13:24:09 -0700 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2012-09-22 13:24:09 -0700 |
commit | d6a93ceb3f523be3a00b5ee8c6380653c764927b (patch) | |
tree | 9699d60dc3b21e9fc7782af93aefdd334cfc46b7 /sound/soc/s6000 | |
parent | fb6f3d69af95006c0518be7fbcd73bff555c837d (diff) | |
parent | 1b90e06b14291ce3c252bd10e4ce981a08152e2e (diff) | |
download | blackbird-op-linux-d6a93ceb3f523be3a00b5ee8c6380653c764927b.tar.gz blackbird-op-linux-d6a93ceb3f523be3a00b5ee8c6380653c764927b.zip |
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.
Diffstat (limited to 'sound/soc/s6000')
0 files changed, 0 insertions, 0 deletions