Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6

Browse source

* '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

...

This commit is contained in:

Linus Torvalds 2008-06-23 12:18:06 -07:00

parent 945754a175 3e14b50dd4

commit 8dca7ffe2c

2 changed files with 4 additions and 4 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

4

sound/isa/sb/sb_mixer.c

View file

4

sound/pci/aw2/aw2-alsa.c

View file