diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-03-21 08:06:05 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-03-21 08:06:05 +0100 |
| commit | 6681bc0deba495fad0d6fb349e40524abd1b1732 (patch) | |
| tree | f6acb7cedb924fd14230dc3273acb26eac393676 /drivers/tty/serial/ifx6x60.c | |
| parent | ca3e9297e29c48eebb010d0225ea580fbcc64c88 (diff) | |
| parent | 22f8d055350066b4a87de4adea8c5213cac54534 (diff) | |
Merge tag 'asoc-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
Last minute ASoC updates for 3.4
There's a couple of small features here that were added late on but have
been in -next in my tree and some bug fixes. The wm_hubs stuff is
actually bug fixes - the stuff that's currently in 3.4 is a half way
house between the two solutions that the latest change allows the
machine to select between.
Diffstat (limited to 'drivers/tty/serial/ifx6x60.c')
0 files changed, 0 insertions, 0 deletions