arch/arm/mach-omap2/cpuidle44xx.c: (partially) revert JB Update 1/3 and partially apply "Fix configs & missing log options" from DhollmenKernel by Tuxafgmur
arch/arm/mach-omap2/display.c: revert JB Update 1/3