diff options
| author |   Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-03-09 12:37:42 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-03-09 12:37:42 +0000 |
| commit | 15086ded21ee7f065ad290c1edfdc49cf18cf96e (patch) | |
| tree | 97b509b33d08a83dcd93406acfeccde4f2843ba5 /kernel | |
| parent | ASoC: Fix double addition of prefixes due to widget prefixing (diff) | |
| parent | ASoC: Use the correct DAPM context when cleaning up final widget set (diff) | |
| download | wireguard-linux-15086ded21ee7f065ad290c1edfdc49cf18cf96e.tar.xz wireguard-linux-15086ded21ee7f065ad290c1edfdc49cf18cf96e.zip | |
Merge branch 'for-2.6.38' into for-2.6.39
Conflicts:
sound/soc/codecs/wm8978.c
sound/soc/soc-dapm.c
Diffstat (limited to 'kernel')
0 files changed, 0 insertions, 0 deletions