diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-01-05 11:06:55 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-01-05 11:06:55 +0100 |
| commit | 74d2b7a34bb69dcbb0a83736c53c33bdc1a6d468 (patch) | |
| tree | a824b7da2936b0a19514541804874ce2c4ffd2d7 /sound/soc/s6000/s6105-ipcam.c | |
| parent | ASoC: Change Samsung Kconfig from ASOC_ to SND_SOC_ (diff) | |
| parent | ASoC: Fix SmartQ compilation (diff) | |
| download | linux-74d2b7a34bb69dcbb0a83736c53c33bdc1a6d468.tar.xz linux-74d2b7a34bb69dcbb0a83736c53c33bdc1a6d468.zip | |
Merge branch 'for-2.6.37' into for-2.6.38
Conflicts:
sound/soc/samsung/smartq_wm8987.c
Diffstat (limited to 'sound/soc/s6000/s6105-ipcam.c')
0 files changed, 0 insertions, 0 deletions