Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 22 Sep 2008 16:09:18 +0000 (09:09 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 22 Sep 2008 16:09:18 +0000 (09:09 -0700)
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
  ALSA: ASoC: Fix at32-pcm build breakage with PM enabled


Trivial merge