tree 119e93184ba04e6cee5798cfd28686100899db1e
parent 08ec2dcc3527a20c619aca2fb36f800908256bac
parent 9d157624035214793c6d06b0512c6ab1a7b39e05
parent b8e0fe31a7c8623741f91bc27f925220341fdf81
author Jiri Kosina <jkosina@suse.cz> 1372943102 +0200
committer Jiri Kosina <jkosina@suse.cz> 1372943102 +0200

Merge branches 'for-3.11/wacom-fixed' and 'for-3.11/wiimote' into for-linus