Revert "updates"

This reverts commit e15fd69667e040dfe7c4ab5370dc187a1ad21ab2.
Revert "fix conflicts"

This reverts commit 323707aaa8afb4e020baeed0b2c0a33a994fb715.
final import of CAF drivers still have to cleanup

Signed-off-by: Bryan Smith <zarboz@gmail.com>

Conflicts:
	arch/arm/mach-msm/devices-8960.c