diff options
author | Jiri Kosina <jkosina@suse.cz> | 2012-03-20 13:04:25 +0100 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2012-03-20 13:04:25 +0100 |
commit | 3abee3526d381e33a391362b01dc8b17d377076d (patch) | |
tree | 48e049e8df0a9059133672dd7bf4e0e4871f00a1 /drivers/hid/hid-input.c | |
parent | Merge tag 'mmc-fixes-for-3.3' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
parent | HID: hid-input/battery: set scope and powered device for HID battery (diff) | |
parent | HID: logitech: fix mask to enable DJ mode (diff) | |
parent | HID: multitouch: detect serial protocol (diff) | |
download | linux-3abee3526d381e33a391362b01dc8b17d377076d.tar.xz linux-3abee3526d381e33a391362b01dc8b17d377076d.zip |
Merge branches 'battery-scope', 'logitech' and 'multitouch' into for-linus