Merge remote-tracking branch 'korg/linux-3.4.y' into cm-11.0

Conflicts:
	drivers/net/ethernet/smsc/smc91x.h
Revert "ARM: allow the kernel text section to be made read-only"

This reverts commit e5e483d13369ab62d95f1738edce3cd64c7ca2ff.

This change breaks LPAE support. Other patches provide the same
functionality so just revert the patch.

Change-Id: Iea1e88064a1618ca1fc9d717ee5a4ffe77681745
Signed-off-by: Laura Abbott <lauraa@codeaurora.org>
Signed-off-by: Stepan Moskovchenko <stepanm@codeaurora.org>
Merge remote-tracking branch 'caf/kk_2.7_rb1.16' into cm-11.0

Conflicts:
	arch/arm/kernel/process.c
	arch/arm/mach-msm/timer.c
	arch/arm/mm/mmu.c
	include/linux/kref.h
	mm/Kconfig
Prima 3.2.7.13
fix mismerge
d2: disable standalone power collapse

Change-Id: I0c3092827ef6fc944d6a47b89cd1a3aa84991d0e
Merge "d2: disable standalone power collapse" into cm-11.0
Merge branch 'nardtest2' of remote branch
Merge remote-tracking branch 'upstream/cm-11.0' into HEAD

Conflicts:
	drivers/net/ethernet/smsc/smc91x.h

Change-Id: I8bcc485b49e1a79b78ab7da864ef589465af6a71