Merge 15 - Various fixes
#modified:   arch/arm/mach-msm/board-msm8x60_dali.c
#modified:   drivers/misc/pmic8058-xoadc.c
#modified:   include/linux/i2c.h
#modified:   include/linux/max17040_battery.h
#modified:   include/linux/mfd/pm8xxx/gpio.h
#modified:   include/linux/mfd/pmic8058.h
#modified:   include/linux/mfd/pmic8901.h
#modified:   include/linux/msm_adc.h
#modified:   include/linux/power_supply.h

Signed-off-by: cholokei <leesl0416@naver.com>