]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'for-4.5/upstream-fixes' into for-next
authorJiri Kosina <jkosina@suse.cz>
Mon, 18 Jan 2016 20:36:18 +0000 (21:36 +0100)
committerJiri Kosina <jkosina@suse.cz>
Mon, 18 Jan 2016 20:36:18 +0000 (21:36 +0100)

Trivial merge