Captivate and Vibrant defconfigs
Testing out new config
Merge branch 'jb-4.2.1' of git://github.com/stratosk/samsung-kernel-aries into jb-4.2.1

Conflicts:
	arch/arm/configs/semaphore_captivate_defconfig