From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 24 Nov 2012 18:32:11 +0000 (-1000)
Subject: Merge tag 'sound-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=194d9831f0419b5125dc94ec0ece4434d8ef74f0;p=openwrt%2Fstaging%2Fblogic.git

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
---

194d9831f0419b5125dc94ec0ece4434d8ef74f0