diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-18 18:07:43 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-18 18:07:43 +0100 |
| commit | d5381e42f64ca19f05c5799ffae5708acb6ed411 (patch) | |
| tree | 8b5e757a9847047102c475c6c583afc191d02e5b /include/sound/Kbuild | |
| parent | f030d60b30855e18ac5bf080fa9e576147623d18 (diff) | |
| parent | b3c27b51db9112d03864fdef44fa611dd69c1425 (diff) | |
| download | kernel_samsung_smdk4412-d5381e42f64ca19f05c5799ffae5708acb6ed411.zip kernel_samsung_smdk4412-d5381e42f64ca19f05c5799ffae5708acb6ed411.tar.gz kernel_samsung_smdk4412-d5381e42f64ca19f05c5799ffae5708acb6ed411.tar.bz2 | |
ASoC: Merge branch 'for-2.6.39' into for-2.6.40
Fix trivial conflict caused by silly spelling fix patch.
Conflicts:
sound/soc/codecs/wm8994.c
Diffstat (limited to 'include/sound/Kbuild')
0 files changed, 0 insertions, 0 deletions