Merge tag 'sound-3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 6 Feb 2013 21:43:30 +0000 (08:43 +1100)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 6 Feb 2013 21:43:30 +0000 (08:43 +1100)
commit6bacaa9ddacb71c691d32c678d37bc59ffc71fac
tree6429fa27227706f1cfe8fa462a141b0646f345ae
parent2110cf029a67237db572299bb51e0de9e3e3d4dd
parent6baa4afa04a79d3a12558401cee0e39004ffcbcf
Merge tag 'sound-3.8' of git://git./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"