Merge remote-tracking branch 'upstream/test_new_dualboot' into new_test
Merge branch 'new_test' of github.com:ckh469/android_kernel_samsung_smdk4412 into new_test
bring-up intelliactive (faux123,psndna88,arter97)
Revert "smdk4412: update sound soc and codecs"

This reverts commit 7dc5a9f4d2212a647eb277294334b163526cfacb.
Revert "ArchiDroid Optimizations"

This reverts commit abee48617c66c49bc02245cbc1948f3aa291e6c5.

Conflicts:
	Makefile
add defconfig: for SHV-E210X