From: Linus Torvalds 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-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=8dca7ffe2cdbcf8a2f188c8230044c3225b70418;p=linux-beck.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