Linux 3.4.64

Conflicts:

	drivers/hid/hid-logitech-dj.c