tree 7ab6d5e2fd22c0cf626524e0f61b977c0ea3ca16
parent f1a4914bd04911fbeaee23445112adae8977144a
parent e1b8ad8e78301b98363feb0b8c1db199e4877cb2
parent 1859762ed538477fc80ada926571d12dc4c9c062
parent e02aea9132cf40e8ef111588b06a93956fe77545
parent e078809df5611600965f4d3420c3256260fc3e3d
parent e17f5d7667c5414b8f12a93ef14aae0824bd2beb
parent 08072dde333c2f09114a01b0bd32be52ecce195b
author Jiri Kosina <jkosina@suse.cz> 1384556697 +0100
committer Jiri Kosina <jkosina@suse.cz> 1384556697 +0100

Merge branches 'for-3.12/upstream-fixes', 'for-3.13/holtek', 'for-3.13/i2c-hid', 'for-3.13/logitech', 'for-3.13/multitouch', 'for-3.13/roccat', 'for-3.13/upstream' and 'for-3.13/wiimote' into for-linus