diff options
author | Olof Johansson <olof@lixom.net> | 2012-09-22 22:24:09 +0200 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2012-09-22 22:24:09 +0200 |
commit | d6a93ceb3f523be3a00b5ee8c6380653c764927b (patch) | |
tree | 9699d60dc3b21e9fc7782af93aefdd334cfc46b7 /drivers/hwmon/adm1026.c | |
parent | Merge branch 'kirkwood/defconfig' of git://git.infradead.org/users/jcooper/li... (diff) | |
parent | ARM: kirkwood: Use devicetree to define DNS-32[05] fan (diff) | |
download | linux-d6a93ceb3f523be3a00b5ee8c6380653c764927b.tar.xz 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 'drivers/hwmon/adm1026.c')
0 files changed, 0 insertions, 0 deletions