tree d84a437e8ed4c3e71521c739952ba96fd02b3781
parent 0be017120b80f0fe3da9a8239f989a27e54828f2
parent c9b57724b38d4c1555ee49418be3d76801e3327c
author Jiri Kosina <jkosina@suse.cz> 1441113793 +0200
committer Jiri Kosina <jkosina@suse.cz> 1441113793 +0200

Merge branches 'for-4.2/upstream-fixes-devm-fixed' and 'for-4.3/upstream' into for-linus