]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'for-4.5/upstream' into for-next
authorJiri Kosina <jkosina@suse.cz>
Mon, 28 Dec 2015 12:13:33 +0000 (13:13 +0100)
committerJiri Kosina <jkosina@suse.cz>
Mon, 28 Dec 2015 12:13:33 +0000 (13:13 +0100)

Trivial merge