Merge branch 'fix/misc' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Mon, 27 Apr 2009 15:15:44 +0000 (17:15 +0200)
committerTakashi Iwai <tiwai@suse.de>
Mon, 27 Apr 2009 15:15:44 +0000 (17:15 +0200)
commitbac0906484aec5131a927c018a8ea1e591c5d66e
treec892faca5b668606681189144f448af11c877667
parent5530f41bd2012fed6b8eb95ed46b72c9f138ca44
parent395a434e39cb6dc6e1ff53bb43722b534a3c68d6
Merge branch 'fix/misc' into for-linus

* fix/misc:
  ALSA: Fix Trivial Warnining in sound/pci/cmipci.c