Linux 3.4.87

Conflicts:
	drivers/hid/hid-ids.h