]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'topic/misc' into for-next
authorTakashi Iwai <tiwai@suse.de>
Tue, 24 Nov 2009 09:23:04 +0000 (10:23 +0100)
committerTakashi Iwai <tiwai@suse.de>
Tue, 24 Nov 2009 09:23:04 +0000 (10:23 +0100)
Conflicts:
sound/usb/usbmidi.c


Trivial merge