diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-05 07:54:22 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-05 07:54:22 -0700 |
| commit | 38c9e91bc396672e9ea8013bad63ea4f59d9d31c (patch) | |
| tree | da602b86052af528c319736c17200730e71742c7 /include/net/sctp/user.h | |
| parent | 1d7aec304147aadcbc66ef9ab691208f9f22b6a8 (diff) | |
| parent | 69b5de84758237ee0086554849489baeeafcd097 (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:
ALSA: hda: Fix 0 dB for Packard Bell models using Conexant CX20549 (Venice)
ALSA: hda - Add quirk for Dell Inspiron 19T using a Conexant CX20582
ALSA: take tu->qlock with irqs disabled
ALSA: hda: Use olpc-xo-1_5 quirk for Toshiba Satellite P500-PSPGSC-01800T
ALSA: hda: Use olpc-xo-1_5 quirk for Toshiba Satellite Pro T130-15F
ALSA: hda - fix array indexing while creating inputs for Cirrus codecs
ALSA: es968: fix wrong PnP dma index
Diffstat (limited to 'include/net/sctp/user.h')
0 files changed, 0 insertions, 0 deletions