diff options
| author | David S. Miller <davem@davemloft.net> | 2014-05-24 14:03:33 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-05-24 14:03:33 -0400 |
| commit | 6c705d1362074f904394dbfbf2945c5180da4cc5 (patch) | |
| tree | 2229d952903469f6468c3e467354ddd762b034fe /net/tipc/socket.c | |
| parent | 54e5c4def0614ab540fbdf68e45342a4af141702 (diff) | |
| parent | f4c6e06dec2bfb71daf98ffc67a98866f66e17a8 (diff) | |
| download | linux-6c705d1362074f904394dbfbf2945c5180da4cc5.tar.gz linux-6c705d1362074f904394dbfbf2945c5180da4cc5.tar.bz2 linux-6c705d1362074f904394dbfbf2945c5180da4cc5.zip | |
Merge branch 'ks8851'
Stephen Boyd says:
====================
ks8851 DT/regulator/gpio updates
This set of patches properly documents the micrel ks8851 spi ethernet
controller, converts to devm_regulator_get_optional() to make error
paths slightly simpler, and finally adds supports for another
optional regulator and a reset gpio. This allows me to use the ks8851
on my MSM8960 CDP board.
Changes since v1:
* Dropped vendor prefix patch as that should go through DT tree
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/tipc/socket.c')
0 files changed, 0 insertions, 0 deletions