Derp Derp
Merge branch 'linux-3.0.y' of https://github.com/RenderBroken/android_kernel_samsung_smdk4412 into linux-3.0.y

Conflicts:
	arch/arm/configs/cyanogenmod_i777_defconfig
	arch/arm/configs/kernel_defconfig
	arch/arm/configs/kernel_defconfig~429629608260f840e7d61ad3c74ed183e7392f09
	arch/arm/configs/kernel_defconfig~HEAD_1
	arch/arm/mach-exynos/mach-u1.c
	drivers/gpu/mali400/r3p2/ump/Kbuild
	drivers/power/sec_battery_u1.c
	drivers/video/samsung/mdnie_table_kona.h
	drivers/video/samsung/mdnie_table_santos7.h