Remove JB Update3 removements

Conflicts: arch/arm/mach-omap2/board-espresso-display.c