Revert "Add more pm8921 stuff from mako"

This reverts commit a6c2bfc95892d66fed5bc77dab29de6399329265.
Revert "Revert "Get rid of LGE power drivers... I added em back, but decided against using them.""

This reverts commit 140ca9a8d79bf3c51cb0e45f7482df2454170c6d.
Revert "msm: power: Revert LGE power patches"

This reverts commit 7c229e5e34e6693088887301e13eec89b9748621.

Conflicts:
	arch/arm/mach-msm/lge/mako/board-mako-pmic.c
	drivers/power/Makefile
	drivers/power/pm8921-bms.c
	drivers/power/pm8921-charger.c
	include/linux/mfd/pm8xxx/pm8921-bms.h
	include/linux/mfd/pm8xxx/pm8921-charger.h
Revert "use msm8960_defconfig instead of mako_defconfig"

This reverts commit 6437643f0252857ee98b205549ab913c4c9a78d2.

Conflicts:
	drivers/media/video/msm/actuators/msm_actuator.c
Fix pm8xxx include errors
Fix pm8921-bms.h
Fix some board files by merging board-8064.h with board-mako.h and using it as the include in the other board files
Merge branch 'cafpm' of github.com:xboxfanj/kernel_caf_2.5 into cafpm
Add more board file fixes... mostly for camera, but in display, I added back the backlight code