Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 29 Aug 2008 21:46:49 +0000 (14:46 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 29 Aug 2008 21:46:49 +0000 (14:46 -0700)
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
  ALSA: oxygen: fix distorted output on AK4396-based cards
  Revert "ALSA: hda - Added model selection for iMac 24""


Trivial merge