updates
Revert "updates"

This reverts commit e15fd69667e040dfe7c4ab5370dc187a1ad21ab2.
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
updates
more fixie
remove backups etc
more fixie
fixie conflicts
adding files