summaryrefslogtreecommitdiffstats
path: root/drivers/hsi/hsi.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-04-27 00:32:39 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2012-04-27 00:32:39 +0200
commit2390c0fca6d31af0c1194a491d9629fbe27703b8 (patch)
tree303f982c94a75339c93d4468df54b86fdd2abdd9 /drivers/hsi/hsi.c
parentMerge git://www.linux-watchdog.org/linux-watchdog (diff)
parentMerge tag 'asoc-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie... (diff)
downloadlinux-2390c0fca6d31af0c1194a491d9629fbe27703b8.tar.xz
linux-2390c0fca6d31af0c1194a491d9629fbe27703b8.zip
Merge tag 'sound-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
Pull sound fixes from Takashi Iwai: "A workaround for an ASUS laptop and a few ASoC changes; most of the commits are tagged for stable, too." * tag 'sound-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: ASoC: wm8994: Improve sequencing of AIF channel enables ALSA: HDA: Add external mic quirk for Asus Zenbook UX31E ASoC: fsi: update for dmaengine prep_slave_sg fallout. ASoC: core: Fix card RTD count for deferred probe. ASoC: cs42l73: don't use negative array index ASoC: dapm: Ensure power gets managed for line widgets
Diffstat (limited to 'drivers/hsi/hsi.c')
0 files changed, 0 insertions, 0 deletions