Merge tag 'mfd-lee-3.12-2' of git://git.linaro.org/people/ljones/mfd