linux-wandboard

Merge branch 'fix/misc' into for-linus

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