Merge tag 'sound-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 24 Nov 2012 18:32:11 +0000 (08:32 -1000)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 24 Nov 2012 18:32:11 +0000 (08:32 -1000)
commit194d9831f0419b5125dc94ec0ece4434d8ef74f0
treeea50492504dbb9965ba6a0abf8f270febdb6e669
parent2654ad44b5f7a5f1b12d722a37d9b9df69d57899
parentd846b17475d52f037437d125cd19c28f1d36e4f0
Merge tag 'sound-3.7' of git://git./linux/kernel/git/tiwai/sound

Pull sound build error fix from Takashi Iwai:
 "Only a single commit for fixing the build error without CONFIG_PM in
  hda driver."

* tag 'sound-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
  ALSA: hda - Fix build without CONFIG_PM