Merge branches 'for-3.12/upstream-fixes', 'for-3.13/holtek', 'for-3.13/i2c-hid',...
authorJiri Kosina <jkosina@suse.cz>
Fri, 15 Nov 2013 23:04:57 +0000 (00:04 +0100)
committerJiri Kosina <jkosina@suse.cz>
Fri, 15 Nov 2013 23:04:57 +0000 (00:04 +0100)

Trivial merge