Merge remote-tracking branch 'local/stable-3.0' into omapzoom-android-omap3-3.0+android+stable

Conflicts:
	arch/arm/include/asm/hardware/cache-l2x0.h

[steven@steven676.net: fix merge of 0e69b54 ("ARM: 7080/1: l2x0:
make sure I&D are not locked down on init")]
[steven@steven676.net: fix up a848996 ("OMAP4460: L2X0: Temporary
work-around for stability.") for changes in 0e69b54]
[steven@steven676.net: fix up 809ce74 ("OMAP4: PM: Add MPUSS OSWR
support") for changes in 0e69b54]

Conflicts:
	arch/arm/include/asm/hardware/cache-l2x0.h