Changes for getting the franebuffer working with Kitkat
Merge branch 'master' of github.com:crewrktablets/rk3x_kernel_3.0.36

Conflicts:
	arch/arm/mach-rk30/board-odys-genio.c
	drivers/input/touchscreen/Makefile