From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 23 Jun 2008 19:18:06 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
X-Git-Tag: v2.6.26-rc8~14
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=8dca7ffe2cdbcf8a2f188c8230044c3225b70418;p=linux-2.6-omap-h63xx.git

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: sb - Fix wrong assertions
  ALSA: aw2 - Fix Oops at initialization
---

8dca7ffe2cdbcf8a2f188c8230044c3225b70418