git.karo-electronics.de Git - karo-tx-linux.git/commit

Merge branches 'for-3.9/logitech', 'for-3.9/multitouch', 'for-3.9/ntrig', 'for-3.9/thingm' and 'for-3.9/upstream' into for-linus

MAINTAINERS	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	blob \| history
drivers/hid/hid-core.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	blob \| history
drivers/hid/hid-ids.h	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	blob \| history
drivers/hid/hid-lg.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	blob \| history
drivers/hid/hid-multitouch.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	blob \| history
drivers/hid/hid-ntrig.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	blob \| history
drivers/hid/hid-sensor-hub.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	blob \| history
include/linux/hid.h	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	blob \| history