commit | 3e097d1271ecdff2f251a54ddfc5eaa1f9821e96 | [log] [tgz] |
---|---|---|
author | Jiri Kosina <jkosina@suse.cz> | Tue Sep 01 15:23:13 2015 +0200 |
committer | Jiri Kosina <jkosina@suse.cz> | Tue Sep 01 15:23:13 2015 +0200 |
tree | d84a437e8ed4c3e71521c739952ba96fd02b3781 | |
parent | 0be017120b80f0fe3da9a8239f989a27e54828f2 [diff] | |
parent | c9b57724b38d4c1555ee49418be3d76801e3327c [diff] |
Merge branches 'for-4.2/upstream-fixes-devm-fixed' and 'for-4.3/upstream' into for-linus