3.0.96
Merge branch 'uber-NO-BLN' of https://github.com/Cl3Kener/HERC-KERNELS into clear

Conflicts:
	Makefile
Merge branch 'clear' of https://github.com/toyes/android_kernel_samsung_msm8660-common into clear