Merge branch 'fix/misc' into for-linus

* fix/misc:
  ALSA: riptide -  proper handling of pci_register_driver for joystick
This commit is contained in:
Takashi Iwai 2009-07-16 16:35:48 +02:00
commit 9d79b13691