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, 23 Jun 2008 19:18:06 +0000 (12:18 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 23 Jun 2008 19:18:06 +0000 (12:18 -0700)
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
  ALSA: sb - Fix wrong assertions
  ALSA: aw2 - Fix Oops at initialization


Trivial merge