From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 6 May 2014 03:18:40 +0000 (+1000)
Subject: Merge remote-tracking branch 'regulator/for-next'
X-Git-Tag: next-20140506~41
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=6306d1eed0c594775ef03f96bf9e4fcd06f9b812;p=karo-tx-linux.git

Merge remote-tracking branch 'regulator/for-next'

Conflicts:
	drivers/regulator/tps65090-regulator.c
---

6306d1eed0c594775ef03f96bf9e4fcd06f9b812