tree e6519241f27f4b3ea237121730f2b50984ec2c67
parent 901e64dbdb5998b9248c372a401c921bbdf662f6
parent b580169affd7ccc9347cbf4d5f4db1480ee7ee06
parent 3c1c2fce64fdfa2f0c0ff4fffb3bb171ea6361ca
author Jiri Kosina <jkosina@suse.cz> 1311367628 +0200
committer Jiri Kosina <jkosina@suse.cz> 1311367628 +0200

Merge branches 'roccat', 'upstream' and 'wiimote' into for-linus