Merge tag 'v3.18-rc4' into regulator-max77686

Linux 3.18-rc4