aboutsummaryrefslogtreecommitdiff
path: root/block
diff options
context:
space:
mode:
authorLinus Torvalds2011-06-06 17:51:28 +0900
committerLinus Torvalds2011-06-06 17:51:28 +0900
commit0d6925d43bd637fe4da7acb7bf1d0b92d38ab34b (patch)
tree54519330c5eead47d14c654d46e179c6a3e0542c /block
parentc12f667e7563c2c0e0908c997900b91b41b23592 (diff)
parent3190dad97b5105ec9b9720f6d7bea54ee830fc2d (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: usb - turn off de-emphasis in s/pdif for cm6206 ALSA: asihpi: Use angle brackets for system includes ALSA: fm801: add error handling if auto-detect fails ALSA: hda - Check pin support EAPD in ad198x_power_eapd_write ALSA: hda - Fix HP and Front pins of ad1988/ad1989 in ad198x_power_eapd() ALSA: 6fire: Don't leak firmware in error path ASoC: Fix wm_hubs input PGA ZC bits ASoC: Fix dapm_is_shared_kcontrol so everything isn't shared
Diffstat (limited to 'block')
0 files changed, 0 insertions, 0 deletions