Merge branch 'fix/misc' into for-linus

* fix/misc:
  ALSA: riptide -  proper handling of pci_register_driver for joystick