From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 12 Sep 2011 03:49:48 +0000 (+1000)
Subject: Merge remote-tracking branch 'mfd/for-next'
X-Git-Tag: next-20110912~37
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=f0db1b2da916d02b0776383d03140affb69412aa;p=karo-tx-linux.git

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

Conflicts:
	drivers/rtc/rtc-twl.c
---

f0db1b2da916d02b0776383d03140affb69412aa