merge more with r3p0
Merge branch 'test2' of github.com:kejar31/android_kernel_samsung_smdk4412 into test2