diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-08-08 14:56:00 +0900 |
|---|---|---|
| committer | Max Krummenacher <max.krummenacher@toradex.com> | 2013-01-21 10:49:40 +0100 |
| commit | e2402172866eaf8f27911c22433bad9d5779b80c (patch) | |
| tree | 654163eab011e30c0a5954874ad150a7214287aa /security | |
| parent | f627315ac4e4b3109dac75701c3242390af5ba57 (diff) | |
Conflict due to the fix for the register map failure - taken the for-3.1 version.
Conflicts:
sound/soc/codecs/sgtl5000.c
Diffstat (limited to 'security')
0 files changed, 0 insertions, 0 deletions