Merge remote-tracking branch 'regulator/topic/tps6586x' into regulator-next

Browse source

...

This commit is contained in:

Mark Brown 2014-06-02 17:08:14 +01:00

parent b58e917bf9 ae8b70c9d8

commit 978371cbab

3 changed files with 64 additions and 10 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

4

drivers/mfd/tps6586x.c

View file

68

drivers/regulator/tps6586x-regulator.c

View file

2

include/linux/mfd/tps6586x.h

View file