]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'for-4.3/upstream' into for-next
authorJiri Kosina <jkosina@suse.com>
Tue, 14 Jul 2015 20:49:00 +0000 (22:49 +0200)
committerJiri Kosina <jkosina@suse.com>
Tue, 14 Jul 2015 20:49:00 +0000 (22:49 +0200)

Trivial merge