Merge branch 'topic/misc' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Wed, 10 Jun 2009 05:26:37 +0000 (07:26 +0200)
committerTakashi Iwai <tiwai@suse.de>
Wed, 10 Jun 2009 05:26:37 +0000 (07:26 +0200)
commit8c3ff3a7fb9730564554bb65d54455e6ce8ad340
treee21bbdab8537678b85f9661ceb89f09989a9935b
parented8cc176c9d3f8fbc2ddc18b75362be666e6d328
parentad0b0822f98ef547e2461ce463e4233bad7848a8
Merge branch 'topic/misc' into for-linus

* topic/misc:
  ALSA: sgio2audio.c: clean up checking
  ALSA: burgundy: timeout message is off by one.
  ALSA: bt87x - Add a quirk entry for Askey Computer Corp. MagicTView'99
  ALSA: parisc/harmony: fix printk format warning
  ALSA: keywest: Get rid of useless i2c_device_name() macro