tree 2d8829ef468ffd4a75015d5eb2b473df90064dec
parent 0d0f3ef248e359b7363830fbd6df23897bbd1ceb
parent 9778e9a0eafe796c2affcd1fa1fa8a3765e026e6
author Linus Torvalds <torvalds@linux-foundation.org> 1222700896 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1222700896 -0700

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/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