diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-04-26 15:32:39 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-04-26 15:32:39 -0700 |
commit | 2390c0fca6d31af0c1194a491d9629fbe27703b8 (patch) | |
tree | 303f982c94a75339c93d4468df54b86fdd2abdd9 /net/netfilter/xt_realm.c | |
parent | 65dd4b91080157fce76a3d60338e33dfa02c4bf8 (diff) | |
parent | cff7873554eedc044029c41a9fd694245d97eff8 (diff) | |
download | linux-stable-2390c0fca6d31af0c1194a491d9629fbe27703b8.tar.gz linux-stable-2390c0fca6d31af0c1194a491d9629fbe27703b8.tar.bz2 linux-stable-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 'net/netfilter/xt_realm.c')
0 files changed, 0 insertions, 0 deletions