summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLee Jones <lee.jones@linaro.org>2014-06-03 08:08:40 +0100
committerLee Jones <lee.jones@linaro.org>2014-06-03 08:08:40 +0100
commit28fee3fa0e33eca809ea0bb75c45f4910360322c (patch)
treebdba2c9d19f74a881b60ade0f93e85526976b6be
parent4b660a7f5c8099d88d1a43d8ae138965112592c7 (diff)
parent780aaeff96819ca58e0cad830bfbe6eee9aef82c (diff)
parentfdb56c45a2cadd11b27447f9468c712b59e15b33 (diff)
parent4bd5e3049b44f2d71b4c5df194e4ebcc7e41a649 (diff)
parent8a82b408acad29161c43072727151d373e68116a (diff)
parent9e9dc7d9597bd6881b3e7ae6ae3d710319605c47 (diff)
parent99451dceeb5fdd789f0a2eeb3ee029e80d2ccc40 (diff)
parenta613b739b8c08eab811e677810045cc0522fc3e6 (diff)
parentc42ba72ec3a7a1b6aa30122931f1f4b91b601c31 (diff)
Merge branches 'ib-from-asoc-3.16', 'ib-from-pm-3.16', 'ib-from-regulator-3.16', 'ib-mfd-gpio-3.16' and 'ib-mfd-mmc-memstick-3.16', tags 'ib-mfd-extcon-3.16', 'ib-mfd-omap-3.16' and 'ib-mfd-regulator-3.16' into ibs-for-mfd-merged