]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'for-3.16/upstream' into for-next
authorJiri Kosina <jkosina@suse.cz>
Mon, 26 May 2014 22:41:27 +0000 (00:41 +0200)
committerJiri Kosina <jkosina@suse.cz>
Mon, 26 May 2014 22:41:27 +0000 (00:41 +0200)

Trivial merge