Merge tag 'v3.4.104' into liquid

This is the 3.4.104 stable release

Signed-off-by: Chet Kener <Cl3Kener@gmail.com>

Conflicts:
	drivers/hid/hid-logitech-dj.c