From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 16 Jun 2008 17:23:21 +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-rc7~28
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=649cf0ff4b998e3082c6d9d8673eaab71f3de656;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:
  sound: oxygen: fix NULL pointer dereference when loading snd-oxygen
---

649cf0ff4b998e3082c6d9d8673eaab71f3de656