summaryrefslogtreecommitdiffstats
path: root/drivers/hid/hid-ids.h
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2009-12-07 18:30:49 +0100
committerJiri Kosina <jkosina@suse.cz>2009-12-07 18:30:49 +0100
commit447753d97764b0ae3969936ec495e794baa88052 (patch)
tree4db7e848aab1891349b34bc173b6626ffc999f44 /drivers/hid/hid-ids.h
parentMerge branch 'x86-debug-for-linus' of git://git.kernel.org/pub/scm/linux/kern... (diff)
parentHID: remove BKL from hiddev_ioctl_usage() (diff)
parentHID: support Logitech/3DConnexion SpaceTraveler and SpaceNavigator (diff)
parentHID: add multi-input quirk for NextWindow Touchscreen. (diff)
downloadlinux-447753d97764b0ae3969936ec495e794baa88052.tar.xz
linux-447753d97764b0ae3969936ec495e794baa88052.zip
Merge branches 'bkl-removal', 'upstream' and 'upstream-fixes' into for-linus