Linux 3.4.15

Conflicts:
	arch/mips/kernel/kgdb.c