]> git.kernelconcepts.de Git - karo-tx-uboot.git/commitdiff
ARM: mxs: spl_power_init: fix merge error leading to "redefinition of 'mxs_init_batt_...
authorLothar Waßmann <LW@KARO-electronics.de>
Fri, 21 Aug 2015 14:44:39 +0000 (16:44 +0200)
committerLothar Waßmann <LW@KARO-electronics.de>
Fri, 21 Aug 2015 14:44:39 +0000 (16:44 +0200)

No differences found