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)
commit8dca7ffe2cdbcf8a2f188c8230044c3225b70418
tree6192acd52c4bd0dcb0f502f35f94a8200ce6cf4c
parent945754a1754f9d4c2974a8241ad4f92fad7f3a6a
parent3e14b50dd4a3178f4f635267a2706b5d4f8c61ee
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: sb - Fix wrong assertions
  ALSA: aw2 - Fix Oops at initialization