]> git.openfabrics.org - ~shefty/rdma-dev.git/commitdiff
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)
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


Trivial merge