Merge branch 'ib-mfd-io-3.15' into HEAD
authorLee Jones <lee.jones@linaro.org>
Wed, 19 Mar 2014 08:57:53 +0000 (08:57 +0000)
committerLee Jones <lee.jones@linaro.org>
Wed, 19 Mar 2014 08:57:53 +0000 (08:57 +0000)

Trivial merge