Merge branch 'topic/misc' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Mon, 22 Jun 2009 15:03:52 +0000 (17:03 +0200)
committerTakashi Iwai <tiwai@suse.de>
Mon, 22 Jun 2009 15:03:52 +0000 (17:03 +0200)
commitb61eaa924c320821469caa0cd2bf89e7a1ec8bd0
treea508d414fe278685c2010ef7cb454d25ad6c61e7
parent11a93fd9402ce47e4dc652837b1374ecdb750aba
parent115551d98e4c05bb982bd940f08a489fa9b0a4a1
Merge branch 'topic/misc' into for-linus

* topic/misc:
  ALSA: via82xx: add option to disable 500ms delay in snd_via82xx_codec_wait