]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'for-3.13/upstream' into for-next
authorJiri Kosina <jkosina@suse.cz>
Wed, 25 Sep 2013 09:29:04 +0000 (11:29 +0200)
committerJiri Kosina <jkosina@suse.cz>
Wed, 25 Sep 2013 09:29:04 +0000 (11:29 +0200)

Trivial merge