]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'for-4.4/upstream' into for-next
authorJiri Kosina <jkosina@suse.cz>
Fri, 6 Nov 2015 10:11:38 +0000 (11:11 +0100)
committerJiri Kosina <jkosina@suse.cz>
Fri, 6 Nov 2015 10:11:38 +0000 (11:11 +0100)

Trivial merge