Merge branches 'for-3.11/upstream-fixes' and 'for-3.11/logitech-enumeration-fix'...
authorJiri Kosina <jkosina@suse.cz>
Wed, 31 Jul 2013 22:48:52 +0000 (00:48 +0200)
committerJiri Kosina <jkosina@suse.cz>
Wed, 31 Jul 2013 22:48:52 +0000 (00:48 +0200)

Trivial merge