Linux 3.4.63

Conflicts:
	arch/mips/ath79/clock.c
	arch/powerpc/kernel/align.c