Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 7 Feb 2012 22:05:49 +0000 (14:05 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 7 Feb 2012 22:05:49 +0000 (14:05 -0800)
commitabaaf3e12c74ef39c8ba185c485f63274264cb0f
tree72851a2095cadb38473c1460a31942403daa2e4b
parent71ea4efe4fc3319ab577be00d1bbcb76d3ffaf63
parent2bd05db718cf452fe235c7c08083b2e60f787f3a
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: Avoid twl6040-codec PLL reconfiguration when not needed
  mfd: Store twl6040-codec mclk configuration