]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge branch 'for-4.1/upstream' into for-next
authorJiri Kosina <jkosina@suse.cz>
Wed, 4 Mar 2015 22:33:06 +0000 (23:33 +0100)
committerJiri Kosina <jkosina@suse.cz>
Wed, 4 Mar 2015 22:33:06 +0000 (23:33 +0100)

Trivial merge