]> git.karo-electronics.de Git - karo-tx-linux.git/commit
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)
commitbdbba6aac2a43afbdf36bc0cb7817e1cb69ed547
treee2980ef75d6592de03a9e1d8cfebabc1e4e1add0
parent19d6c9737e10fb06f110e655d28a7312468c505a
parenta014bbadb53121e243cac254593e79e3ca89742d
Merge branch 'topic/misc' into for-next

Conflicts:
sound/usb/usbmidi.c