ION: bring up ion_carveout_heap and ion_cp_heap
bringup ION_MSM and MSM_MULTIMEDIA_USE_ION
KK: update sec_battery header files
KK: merge max77693 with newer sources
drivers/battery: rename INIT_DELAYED_WORK_DEFERRABLE
.config: turn on battery stuff
cypress_touchkey.h: add missing extern

Still not fully merged w/ KK Sources though.
KK: merge with cypress_touchkey_236
mach-msm/memory: import needed functions
KK: merge with acpuclock-krait
KK: import es325-fw-tmo.bin

Still using 1.05 version of es325 drivers in sound/soc/codecs, not 1.00
which Samsung uses...
.config: enable KSM