From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 14 Dec 2011 04:30:23 +0000 (+1100)
Subject: Merge remote-tracking branch 'regmap/for-next'
X-Git-Tag: next-20111214~19
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=ac09b309f94d082f356f6161835f151258313d0c;p=karo-tx-linux.git

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

Conflicts:
	drivers/base/regmap/regcache.c
	drivers/base/regmap/regmap.c
---

ac09b309f94d082f356f6161835f151258313d0c