]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge branch 'for-4.1/upstream' into for-next
authorJiri Kosina <jkosina@suse.cz>
Sun, 15 Mar 2015 14:11:41 +0000 (10:11 -0400)
committerJiri Kosina <jkosina@suse.cz>
Sun, 15 Mar 2015 14:11:41 +0000 (10:11 -0400)

Trivial merge