]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'for-3.8/upstream' into for-next
authorJiri Kosina <jkosina@suse.cz>
Tue, 20 Nov 2012 16:36:23 +0000 (17:36 +0100)
committerJiri Kosina <jkosina@suse.cz>
Tue, 20 Nov 2012 16:36:23 +0000 (17:36 +0100)

Trivial merge