Merge branch 'for-linus' of git://opensource.wolfsonmicro.com/regulator