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, 19 May 2008 16:24:49 +0000 (09:24 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 19 May 2008 16:24:49 +0000 (09:24 -0700)
commit83e0c24a38aa91f7d932bbcab257093b82435074
treeeb0516fd12599e88e85bb1e63473548cbdc85540
parent161fb0cf5c7e94cd0490e4bd04edcf1e24d1d288
parent42ece6c1f8162cd782b44dc4863679e888531df5
Merge branch 'for-linus' of git://git./linux/kernel/git/tiwai/sound-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
  snd-pcsp: silent misleading warning
  snd-pcsp: depend on CONFIG_EXPERIMENTAL
  snd-pcsp: put back the compatibility code for the older alsa-libs
  snd-pcsp: adjust help texts to frighten users