Merge tag 'mfd-lee-3.12-1' of git://git.linaro.org/people/ljones/mfd
authorSamuel Ortiz <sameo@linux.intel.com>
Wed, 21 Aug 2013 10:08:14 +0000 (12:08 +0200)
committerSamuel Ortiz <sameo@linux.intel.com>
Wed, 21 Aug 2013 10:08:14 +0000 (12:08 +0200)
commit828fa1e60117535d9b1e1b09444842ae66e8424d
tree281f5bff9a12c760ca947a98569df63c8ca85909
parent09fd86780bb4603df1886e17127f5beb97f70ffb
parent8a105ca202b1a1061a24f1e980206cd2808e2f8b
Merge tag 'mfd-lee-3.12-1' of git://git.linaro.org/people/ljones/mfd

Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
drivers/mfd/palmas.c
include/linux/mfd/palmas.h