commit | 649cf0ff4b998e3082c6d9d8673eaab71f3de656 | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Jun 16 10:23:21 2008 -0700 |
committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Jun 16 10:23:21 2008 -0700 |
tree | d003559e5f27ca4038f406f61af707166c135965 | |
parent | 626a16c16e13e4afaba382bfc0354a3555f5231c [diff] | |
parent | 9f9115d880ca550922434aee05ca18796c58eb99 [diff] |
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