Merge branch 'for-mfd' of git://git.linaro.org/people/ljones/linux-3.0-ux500 into...
authorSamuel Ortiz <sameo@linux.intel.com>
Wed, 13 Feb 2013 23:23:17 +0000 (00:23 +0100)
committerSamuel Ortiz <sameo@linux.intel.com>
Wed, 13 Feb 2013 23:23:17 +0000 (00:23 +0100)
commitdce7886e8064d92430bd34e444678f3cd7e3082c
tree4f21d0cd5a86b74371cf500a0fa23b3d58950f40
parentba3980df4fc145f36a577307d6387c42841438fd
parent8908c04985ed67b9138c6e06be2c81867f24e2d4
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>
drivers/mfd/ab8500-core.c
include/linux/mfd/abx500.h