Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 30 Sep 2008 16:38:42 +0000 (09:38 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 30 Sep 2008 16:38:42 +0000 (09:38 -0700)
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
  ALSA: hda - Fix model for Dell Inspiron 1525
  ALSA: ASoC: Fix cs4270 error path


Trivial merge