summaryrefslogtreecommitdiffstats
path: root/drivers/hid/Makefile
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2013-07-04 15:05:02 +0200
committerJiri Kosina <jkosina@suse.cz>2013-07-04 15:05:02 +0200
commit21796b39c9e876a46a353a4a9ff9881766a7c176 (patch)
tree119e93184ba04e6cee5798cfd28686100899db1e /drivers/hid/Makefile
parentMerge branches 'for-3.11/multitouch', 'for-3.11/sony' and 'for-3.11/upstream'... (diff)
parentHID: wacom: Intuos4 battery charging changes (diff)
parentHID: wiimote: support Nintendo Wii U Pro Controller (diff)
downloadlinux-21796b39c9e876a46a353a4a9ff9881766a7c176.tar.xz
linux-21796b39c9e876a46a353a4a9ff9881766a7c176.zip
Merge branches 'for-3.11/wacom-fixed' and 'for-3.11/wiimote' into for-linus