fastcharge v1

Conflicts:

	drivers/misc/fsa9485.c

Conflicts:

	drivers/misc/fsa9485.c

 Author:    imoseyon <imoseyon@gmail.com>
	modified:   arch/arm/mach-msm/Makefile
	new file:   arch/arm/mach-msm/fastchg.c
	new file:   drivers/misc/fsa9485.c
fsa9485: fastcharge v3 - fixed, finally tracked this down
BETA: Fastcharge compile issue fix
Fixed: Fixed fast charge intergration

Lol I don't know which one worked but don't change if it works

	modified:   arch/arm/mach-msm/Makefile
Fast Charge changes
	modified:   arch/arm/mach-msm/fastchg.c
More Fast Charge related

Conflicts:

	arch/arm/configs/cyanogenmod_hercules_defconfig

test implement fast charge from asdk (step 1)
...and more FC
	modified:   arch/arm/configs/cyanogenmod_hercules_defconfig
	modified:   drivers/usb/otg/msm_otg.c
	new file:   include/linux/fastchg.h

Conflicts:

	drivers/usb/otg/msm_otg.c

test implement fast charge from asdk (step 2)
Revert "Fast Charge changes"

This reverts commit 179579ba63535d8c5d11439db6063d8c187c69b3.
Revert "More Fast Charge related"

This reverts commit faf67484bb45ce85f578f99261215fb9672e5173.

Conflicts:

	arch/arm/configs/cyanogenmod_hercules_defconfig

fastcharge step 3
Revert "...and more FC"

This reverts commit 728e7d74e5944b19b01f690572f8c759851b17cc.

Conflicts:

	arch/arm/configs/cyanogenmod_hercules_defconfig

Conflicts:

	arch/arm/configs/cyanogenmod_hercules_defconfig

fastcharge step 5
Revert "fastcharge v1"

This reverts commit 92ec05a8b9a307625ed34e4490682456b4ebaf6b.

Conflicts:

	arch/arm/mach-msm/Makefile
	drivers/misc/fsa9485.c

	modified:   arch/arm/configs/cyanogenmod_hercules_defconfig
	deleted:    arch/arm/mach-msm/fastchg.c

Conflicts:

	arch/arm/configs/cyanogenmod_hercules_defconfig

fastcharge again
Revert "fsa9485: fastcharge v3 - fixed, finally tracked this down"

This reverts commit 0d4f98e27eb4dd306aacab97da9252940ddad78e.
Revert "Fixed: Fixed fast charge intergration"

This reverts commit 8d2b2cfe5f1733274f0a2295b1f75fe3effe321f.

	modified:   arch/arm/mach-msm/Makefile
Added usb fast charge

 Author:    elbermu <angbermu@gmail.com>
	modified:   arch/arm/mach-msm/Kconfig
	modified:   arch/arm/mach-msm/Makefile
	modified:   arch/arm/mach-msm/board-msm8x60_celox.c
	new file:   arch/arm/mach-msm/fastchg.c
	new file:   include/linux/fastchg.h
Yes for FFC
	modified:   arch/arm/configs/cyanogenmod_hercules_defconfig
revert herc defconfig back to moretz (abandon asdk mods) in prep for final fastcharge commits