diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-17 22:21:52 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-17 22:21:52 +0200 |
| commit | b938fb6f491113880ebaabfa06c6446723c702fd (patch) | |
| tree | d19c6487b64b4002b31446160f2670394ab4ef1b /net/ipv4/ipcomp.c | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp (diff) | |
| parent | Merge branch 'fix/hda' into for-linus (diff) | |
| download | linux-b938fb6f491113880ebaabfa06c6446723c702fd.tar.xz linux-b938fb6f491113880ebaabfa06c6446723c702fd.zip | |
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 MSI GX620 mixer
ASoC: remove unused #include <linux/version.h>
ASoC: S3C lrsync function made to work with IRQs disabled.
ALSA: hda - Fix Dell S14 pin setup
ALSA: hda - Fix IDT92HD83* codec setup
ASoC: Fix display of stream name in DAPM debugfs
ALSA: hda - Add support for HP dv6
ALSA: hda - Fix HP/line-out initialization with IDT/STAC codecs
ALSA: hda - Set default GPIO for IDT92HD71bxx
ALSA: hda - Set default GPIO for STAC/IDT codecs
ASoC: Clean up error handling in MPC5200 DMA setup
ALSA: hda - Add missing model=auto entry for ALC269
Diffstat (limited to 'net/ipv4/ipcomp.c')
0 files changed, 0 insertions, 0 deletions