From: Takashi Iwai Date: Thu, 16 Jul 2009 14:35:48 +0000 (+0200) Subject: Merge branch 'fix/misc' into for-linus X-Git-Tag: v2.6.31-rc4~32^2~1 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=9d79b136910de2cf9e4f0e37c3048c0fc7d9eab3;p=karo-tx-linux.git Merge branch 'fix/misc' into for-linus * fix/misc: ALSA: riptide - proper handling of pci_register_driver for joystick --- 9d79b136910de2cf9e4f0e37c3048c0fc7d9eab3