tree 4f21d0cd5a86b74371cf500a0fa23b3d58950f40
parent ba3980df4fc145f36a577307d6387c42841438fd
parent 8908c04985ed67b9138c6e06be2c81867f24e2d4
author Samuel Ortiz <sameo@linux.intel.com> 1360797797 +0100
committer Samuel Ortiz <sameo@linux.intel.com> 1360797797 +0100

Merge branch 'for-mfd' of git://git.linaro.org/people/ljones/linux-3.0-ux500 into for-next

Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>