Merge branch 'regulator' of git://github.com/hzhuang1/linux into next/drivers