mm.h: read_ahead_kb defaults to 256mb
Linux 3.0.58
fsa9485: fastcharge v3 - fixed, finally tracked this down

Conflicts:

	drivers/misc/fsa9485.c
Disregard this
	modified:   arch/arm/mach-msm/acpuclock-8960.c
	modified:   arch/arm/mach-msm/acpuclock-8x60.c