Merge branches 'for-3.19/upstream-fixes', 'for-3.20/apple', 'for-3.20/betop', 'for...

diff --cc drivers/hid/Kconfig
Simple merge

diff --cc drivers/hid/Makefile
Simple merge

diff --cc drivers/hid/hid-core.c
Simple merge

diff --cc drivers/hid/hid-ids.h
Simple merge

diff --cc drivers/hid/hid-input.c
Simple merge

diff --cc drivers/hid/hid-logitech-hidpp.c
Simple merge

diff --cc drivers/hid/usbhid/hid-quirks.c
Simple merge