]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'for-3.16/upstream' into for-next
authorJiri Kosina <jkosina@suse.cz>
Wed, 28 May 2014 13:45:37 +0000 (15:45 +0200)
committerJiri Kosina <jkosina@suse.cz>
Wed, 28 May 2014 13:45:37 +0000 (15:45 +0200)

Trivial merge