From: Takashi Iwai <tiwai@suse.de>
Date: Tue, 24 Nov 2009 09:23:04 +0000 (+0100)
Subject: Merge branch 'topic/misc' into for-next
X-Git-Tag: next-20110726~34^2~934
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=bdbba6aac2a43afbdf36bc0cb7817e1cb69ed547;p=karo-tx-linux.git

Merge branch 'topic/misc' into for-next

Conflicts:
	sound/usb/usbmidi.c
---

bdbba6aac2a43afbdf36bc0cb7817e1cb69ed547