Linux 3.4.67

Conflicts:
	arch/parisc/kernel/traps.c