Merge tag 'ib-mfd-regulator-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorMark Brown <broonie@linaro.org>
Tue, 29 Apr 2014 17:01:28 +0000 (10:01 -0700)
committerMark Brown <broonie@linaro.org>
Tue, 29 Apr 2014 17:01:28 +0000 (10:01 -0700)
Immutable branch between MFD and Regulator due for v3.16 merge-window.

1  2 
include/linux/mfd/tps65090.h

Simple merge