]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'for-3.9/upstream' into for-next
authorJiri Kosina <jkosina@suse.cz>
Fri, 18 Jan 2013 09:59:36 +0000 (10:59 +0100)
committerJiri Kosina <jkosina@suse.cz>
Fri, 18 Jan 2013 09:59:36 +0000 (10:59 +0100)

Trivial merge