diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-12-08 13:54:33 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-12-08 13:54:33 +0000 |
| commit | 5a4cfce73b7b48bdbb4e816124e5fcf84bc58e59 (patch) | |
| tree | 0d84d5096b34bfb794b52dc59271c184e9d3e4ea /sound/soc/codecs/wm8400.h | |
| parent | 6b3ed78535c5af8c1d25ed7eaaea7557698843a1 (diff) | |
| parent | 2a7b1a00206895cfa444fd83477dca67a88a9d25 (diff) | |
Merge branch 'for-2.6.37' into for-2.6.38
Conflicts:
sound/soc/soc-core.c
Axel's fix on two different branches.
Diffstat (limited to 'sound/soc/codecs/wm8400.h')
0 files changed, 0 insertions, 0 deletions