summaryrefslogtreecommitdiffstats
path: root/drivers/hid/hid-input.c
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2012-03-20 13:04:25 +0100
committerJiri Kosina <jkosina@suse.cz>2012-03-20 13:04:25 +0100
commit3abee3526d381e33a391362b01dc8b17d377076d (patch)
tree48e049e8df0a9059133672dd7bf4e0e4871f00a1 /drivers/hid/hid-input.c
parentMerge tag 'mmc-fixes-for-3.3' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff)
parentHID: hid-input/battery: set scope and powered device for HID battery (diff)
parentHID: logitech: fix mask to enable DJ mode (diff)
parentHID: multitouch: detect serial protocol (diff)
downloadlinux-3abee3526d381e33a391362b01dc8b17d377076d.tar.xz
linux-3abee3526d381e33a391362b01dc8b17d377076d.zip
Merge branches 'battery-scope', 'logitech' and 'multitouch' into for-linus