From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 18 Jan 2010 22:11:26 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6
X-Git-Tag: firefly_0821_release~9833^2~3330
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=fe64454d7b0474cc43360d86267844b043275e82;p=firefly-linux-kernel-4.4.55.git

Merge branch 'for-linus' of git://git./linux/kernel/git/sameo/mfd-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6:
  mfd: Unlock mc13783 before subsystems initialisation, at probe time.
  mfd: WM835x GPIO direction register is not locked
  mfd: tmio_mmc hardware abstraction for CNF area
  mfd: WM8350 off by one bug
  mfd: Correct WM835x ISINK ramp time defines
---

fe64454d7b0474cc43360d86267844b043275e82