Linux 3.4.12

Conflicts:
	arch/arm/include/asm/mutex.h
	arch/arm/kernel/traps.c
	drivers/hid/hid-logitech-dj.c