diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-23 10:34:51 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-23 10:34:51 -0700 |
| commit | 847bb224fb1cc8747e58959721b7bccd9b118047 (patch) | |
| tree | 7ce8a7a7b9bef097afb14623dc4ff07e8806fe1d /drivers/mmc/core/Makefile | |
| parent | 9ee47476d6734c9deb9ae9ab05d963302f6b6150 (diff) | |
| parent | e9a8a85d9f88313264d59d40815951a46ff9a4bb (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:
ASoC: i.MX ssi: use SSI_STCCR in synchronous mode
ALSA: hda - Add support for Lenovo S10-3t
ALSA: hda - Fix stream and channel-ids codec-bus wide
ALSA: hda - Fix conflict of sticky PCM parameter in HDMI codecs
ALSA: intel8x0: Mute External Amplifier by default for ThinkPad X31
ALSA: hda - Fix build error with CONFIG_PROC_FS=n
ALSA: hda - Add support for IDT 92HD89XX codecs
Diffstat (limited to 'drivers/mmc/core/Makefile')
0 files changed, 0 insertions, 0 deletions