]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge branch 'for-4.1/upstream' into for-next
authorJiri Kosina <jkosina@suse.cz>
Fri, 27 Mar 2015 15:05:41 +0000 (16:05 +0100)
committerJiri Kosina <jkosina@suse.cz>
Fri, 27 Mar 2015 15:05:41 +0000 (16:05 +0100)

Trivial merge