Merge branches 'from-henrik', 'hidraw', 'logitech', 'picolcd', 'ps3', 'uclogic',...
authorJiri Kosina <jkosina@suse.cz>
Mon, 1 Oct 2012 12:36:26 +0000 (14:36 +0200)
committerJiri Kosina <jkosina@suse.cz>
Mon, 1 Oct 2012 12:36:26 +0000 (14:36 +0200)
commitfa2bd30159499f441125495ba8d9d57f646ea42a
treef5afca7fb3bcccc81f74889adc44c08563dceb40
parent1ad346a9f8ca0d266ddbfdbbbd8913782b417f35
parent4fe9f8e203fdad1524c04beb390f3c6099781ed9
parenta80fe5d6e3190f65be8cc7efa487f187eb3dbffa
parent56fa94415b8a1a163e24a105fb5bdadc625c1d2a
parent5844c1cdb630b537a2ecdf74dab2985e51dc1bd9
parenteb4e426a480ce99004134ee22e6a3b7ab88f979c
parent8908dd806340513dacfd37b21e047946bca995d1
parenta2f6e4e009f13097acafd09cccf274fb5869dde2
Merge branches 'from-henrik', 'hidraw', 'logitech', 'picolcd', 'ps3', 'uclogic', 'wacom' and 'wiimote' into for-linus
MAINTAINERS
drivers/hid/Kconfig
drivers/hid/Makefile
drivers/hid/hid-core.c
drivers/hid/hid-ids.h
drivers/input/mouse/sentelic.c
drivers/input/tablet/wacom_wac.c
drivers/input/touchscreen/edt-ft5x06.c