Merge branches 'for-3.9/logitech', 'for-3.9/multitouch', 'for-3.9/ntrig', 'for-3...

diff --cc MAINTAINERS
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-lg.c
Simple merge

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

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

diff --cc drivers/hid/hid-sensor-hub.c
Simple merge

diff --cc include/linux/hid.h
Simple merge