From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 6 Feb 2013 21:43:30 +0000 (+1100)
Subject: Merge tag 'sound-3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=6bacaa9ddacb71c691d32c678d37bc59ffc71fac;p=linux-beck.git

Merge tag 'sound-3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound

Pull sound fixes from Takashi Iwai:
 "Just a couple of build regression fixes for ASoC fsl stuff.  It
  doesn't look too trivial, but neither intrusive, so hopefully I can
  avoid your curse..."

Hey, Takashi has a good track record, I think he gets a pass..

* tag 'sound-3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
  ASoC: fsl: fix snd-soc-imx-pcm module build
  Revert "ASoC: fsl: fix multiple definition of init_module"
---

6bacaa9ddacb71c691d32c678d37bc59ffc71fac