diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-22 14:59:07 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-22 14:59:07 -0700 |
| commit | 8d082f8f3fb89e8a1fcb5120ad98cd9860c8a3e8 (patch) | |
| tree | 5b3865764bee4511d76248b9eaf5cf166557691d /security/smack | |
| parent | 258ba6a5a9194ea043850f77d1219053c810e043 (diff) | |
| parent | 6a9a6f233baad76b67a448b39bb55fc064755ba4 (diff) | |
| download | talos-obmc-linux-8d082f8f3fb89e8a1fcb5120ad98cd9860c8a3e8.tar.gz talos-obmc-linux-8d082f8f3fb89e8a1fcb5120ad98cd9860c8a3e8.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 unused warnings when !SND_HDA_NEEDS_RESUME
ALSA: hda - Add a fix-up for Acer dmic with ALC271x codec
ASoC: add a module alias to the FSI driver
ALSA: emu10k1 - Fix "Music" controls to "Synth" controls in documents
ARM: s3c2440: gta02; Register dfbmcs320 device for BT audio interface
ASoC: codecs: JZ4740: Fix OOPS
ASoC: Fix output PGA enabling in wm_hubs CODECs
ASoC: sn95031: decorate function with __devexit_p()
ASoC: SAMSUNG: Fix the inverted clocks handling for pcm driver
ASoC: sst_platform: Fix lock acquring
ASoC: fsi: driver safely remove for against irq
ASoC: fsi: modify vague PM control on probe
ASoC: fsi: take care in failing case of dai register
MAINTAINERS: Update Samsung ASoC maintainer's id
ASoC: WM8903: HP and Line out PGA/mixer DAPM fixes
ASoC: Set left channel volume update bits for WM8994
ASoC: fix config error path
ASoC: check channel mismatch between cpu_dai and codec_dai
ASoC: Tegra: Suspend/resume support
Diffstat (limited to 'security/smack')
0 files changed, 0 insertions, 0 deletions
