diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2016-03-17 13:51:54 +0100 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2016-03-17 13:51:54 +0100 |
| commit | e1c9b9ff2420c0d8c25924be312bc422bf9dc056 (patch) | |
| tree | 2475853927cbfdacb29774e697861f177ac065c9 | |
| parent | c14022bfd2eb2d2ece74a405dfbdb02a829c07bc (diff) | |
| parent | ad8ddc5755c27e051c02b39f68ee7ae850d9c549 (diff) | |
| parent | 3b654288b196ceaa156029d9457ccbded0489b98 (diff) | |
| parent | af2e628d6be7a510e2667c3b5358350464d0f5b7 (diff) | |
| parent | d3e69b9a04f8e42de1b4132218567b027d368bb5 (diff) | |
| parent | 5f66872cbd9c2d8e5230da571aed52d9333a04ae (diff) | |
| parent | 1adf904e90059a5b577dbf49b57c27da29b1e69e (diff) | |
| parent | 1d1b564ff852944a10b524f21dfb78818bd43f52 (diff) | |
| parent | f9a82c2054bcdebdf81a63c26a3b41197bb6070a (diff) | |
| parent | f6205161782fa325152340c8fe47c1b90105cfbc (diff) | |
Merge branches 'for-4.5/upstream-fixes', 'for-4.6/cmedia', 'for-4.6/i2c-hid', 'for-4.6/logitech', 'for-4.6/multitouch', 'for-4.6/penmount', 'for-4.6/sony', 'for-4.6/thingm', 'for-4.6/upstream' and 'for-4.6/wacom' into for-linus