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, 29 Sep 2008 15:08:16 +0000 (08:08 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 29 Sep 2008 15:08:16 +0000 (08:08 -0700)
commit66120005e65eed8a05b14a36ab448bdec42f0d6b
tree2d8829ef468ffd4a75015d5eb2b473df90064dec
parent0d0f3ef248e359b7363830fbd6df23897bbd1ceb
parent9778e9a0eafe796c2affcd1fa1fa8a3765e026e6
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:
  ALSA: ASoC: Fix another cs4270 error path
  ALSA: make the CS4270 driver a new-style I2C driver