summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2011-05-23 12:49:25 +0200
committerJiri Kosina <jkosina@suse.cz>2011-05-23 12:49:25 +0200
commit366a2382c68d01638350efcf23d46a47d661c595 (patch)
treec45852727ce4ff7006fc080b95aaf0f6144d2a75
parentHID: hid-example: fix some build issues (diff)
parentHID: hid-multitouch: cosmetic changes, sort classes and devices (diff)
parentHID: hiddev: fix race between hiddev_disconnect and hiddev_release (diff)
parentHID: magicmouse: ignore 'ivalid report id' while switching modes (diff)
downloadlinux-366a2382c68d01638350efcf23d46a47d661c595.tar.xz
linux-366a2382c68d01638350efcf23d46a47d661c595.zip
Merge branches 'doc', 'multitouch', 'upstream' and 'upstream-fixes' into for-linus