Linux 3.4.69

Conflicts:
	arch/parisc/kernel/head.S