summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2011-07-22 22:47:08 +0200
committerJiri Kosina <jkosina@suse.cz>2011-07-22 22:47:08 +0200
commita91f423e598912ab301592c7759cfd89e10682a1 (patch)
treee6519241f27f4b3ea237121730f2b50984ec2c67 /drivers
parent901e64dbdb5998b9248c372a401c921bbdf662f6 (diff)
parentb580169affd7ccc9347cbf4d5f4db1480ee7ee06 (diff)
parent3c1c2fce64fdfa2f0c0ff4fffb3bb171ea6361ca (diff)
downloadlinux-a91f423e598912ab301592c7759cfd89e10682a1.tar.bz2
Merge branches 'roccat', 'upstream' and 'wiimote' into for-linus