Linux 3.4.15

Conflicts:

	arch/arm/Kconfig