Merge linux v3.0.50 into mackay-cm101.

Conflicts:
	arch/arm/kernel/smp.c

Change-Id: Icbaf3f4ebb2f14e87ebcf66d9be25f8d2923b61f