]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branches 'floppy' and 'pktcdvd' into for-jens
authorJiri Kosina <jkosina@suse.cz>
Tue, 4 Sep 2012 09:10:27 +0000 (11:10 +0200)
committerJiri Kosina <jkosina@suse.cz>
Tue, 4 Sep 2012 09:10:27 +0000 (11:10 +0200)

Trivial merge