Linux 3.4.15

Conflicts:
	arch/mips/kernel/kgdb.c

Conflicts:
	arch/arm/mm/cache-v7.S