diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-11 12:45:59 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-11 12:45:59 -0700 |
| commit | 0fb3767b0a5601dd0d528bc8dbefc0567a34b7ec (patch) | |
| tree | 76eed01d088080863f5bf97e37ae4ec1adf9d0a5 /drivers/nfc/pn544 | |
| parent | 0edcd16a4def296bd6492ae0c10a3c4aef9ef7c0 (diff) | |
| parent | 42d4ab832d843b5a512b373c86e70caa43a041c8 (diff) | |
Merge tag 'sound-3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
Pull sound fixes from Takashi Iwai:
"A few small fixes (and cleanups) for HD-audio, USB-audio and ASoC"
* tag 'sound-3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
ALSA: usb-audio: fix regression for fixed stream quirk
ALSA: hda - Keep halting ALC5505 DSP
ASoC: wm8962: fix NULL pdata pointer
ASoC: imx-sgtl5000: return E_PROBE_DEFER if ssi/codec not found
ASoC: Samsung: Remove redundant comment
ALSA: hda - Fix EAPD vmaster hook for AD1884 & co
ASoC: samsung: Remove obsolete GPIO based DT pinmuxing
ASoC: mxs: register saif mclk to clock framework
Diffstat (limited to 'drivers/nfc/pn544')
0 files changed, 0 insertions, 0 deletions