Linux 3.4.12

Change-Id: I737d18826dc26ad5abd8d8304d895b8160be468b
Signed-off-by: Willi Ye <williye97@gmail.com>

Conflicts:
	arch/arm/kernel/traps.c
	drivers/hid/hid-logitech-dj.c