Merge branch 'fix/misc' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Thu, 16 Jul 2009 14:35:48 +0000 (16:35 +0200)
committerTakashi Iwai <tiwai@suse.de>
Thu, 16 Jul 2009 14:35:48 +0000 (16:35 +0200)
commit9d79b136910de2cf9e4f0e37c3048c0fc7d9eab3
tree77fdffedeb0c52a00b0bfaaeafeec946d6e09517
parent26887793b64ae93342c1e2548595d4c6f7dce694
parentcb65c8732a50f8a145d36dbdac026a1789ad1587
Merge branch 'fix/misc' into for-linus

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