Update based on protou
Conflicts:
	arch/arm/mach-msm/display/board-pico-panel.c
Update pico panel based on protou (part 2)