Merge branch 'fix/asoc' into for-linus

* fix/asoc:
  ASoC: Fix NULL pointer dereference in __pxa2xx_pcm_hw_free