Captivate and Vibrant configs for 2.9.12
Merge remote-tracking branch 'refs/remotes/origin/jb-4.2.1' into jb-4.2.1

Conflicts:
	arch/arm/configs/semaphore_captivate_defconfig
	arch/arm/configs/semaphore_vibrant_defconfig