diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-11-19 15:43:50 +0900 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-11-19 15:43:50 +0900 |
| commit | 24a118de116856323f51c664102b6afdad6a8be7 (patch) | |
| tree | c9f575a7742fb95ff69009308a36868bebf54eed | |
| parent | 5886c743799f9190304b40255519cea5b50164ca (diff) | |
| parent | f4a75d2eb7b1e2206094b901be09adb31ba63681 (diff) | |
Merge tag 'v3.7-rc6' into asoc-arizona
Linux 3.7-rc6
Conflicts:
sound/soc/codecs/wm5102.c