Merge branch 'for-mfd-next' of git://git.linaro.org/people/ljones/linux-3.0-ux500
authorSamuel Ortiz <sameo@linux.intel.com>
Wed, 19 Jun 2013 09:57:38 +0000 (11:57 +0200)
committerSamuel Ortiz <sameo@linux.intel.com>
Wed, 19 Jun 2013 09:57:38 +0000 (11:57 +0200)
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>

Trivial merge