diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-19 10:57:38 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-19 10:57:38 -0700 |
| commit | af8f937274437fa81b95e4e2d461460220636cb8 (patch) | |
| tree | a0fce546e4693e759ed944ba37603c36bf514430 /include/scsi/scsi_netlink_fc.h | |
| parent | 091ccb006fcf5c4aa1283901ca6e62ff85b3a569 (diff) | |
| parent | d6aa764ee8674512287913fcc3a0b1b5c050d5eb (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 - Set function_id only on FG nodes
ALSA: MAINTAINERS - Update SOUND
ALSA: emu10k1 - off by 1 in snd_emu10k1_wait()
ASoC: OMAP: Fix FS polarity in OSK5912 machine driver
ASoC: OMAP: Fix DSP_B format in OMAP McBSP DAI driver
ASoC: Fix include build error in s3c2412-i2s.c
ASoC: Fix s3c-i2s-v2.c snd_soc_dai changes
ASoC: s3c-i2s-v2.c fix for s3c_i2sv2_iis_calc_rate
ASoC: Fix jive_wm8750.c build problems
ASoC: pxa-ssp: allow setting of dai format 0
ALSA: hda - Add upper-limit of mixer amp for AD1884A-laptop model, too
ALSA: hda - Fix headphone-detection on some machines with STAC/IDT codecs
ALSA: Intel8x0: Add hp_only quirk for SSID 0x1028016a (Dell Inspiron 8600)
ALSA: Intel8x0: Remove conflicting quirk for SSID 0x103c0934
ALSA: hda_intel.c - Consolidate bitfields
Diffstat (limited to 'include/scsi/scsi_netlink_fc.h')
0 files changed, 0 insertions, 0 deletions