diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-02-20 06:35:12 +0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-02-20 06:35:12 +0400 |
| commit | fa2c8f401797eee814b7b9fa0b23fa6c4c3f5533 (patch) | |
| tree | 826fb23071b866e112d6e9c510fe3ad4d668acdc /include/sound/sh_fsi.h | |
| parent | a387419612f9c246701a5080bccecf3c04f65277 (diff) | |
| parent | b01543dfe67bb1d191998e90d20534dc354de059 (diff) | |
| download | linux-fa2c8f401797eee814b7b9fa0b23fa6c4c3f5533.tar.xz | |
Merge tag 'v3.3-rc4' into for-3.4 in order to resolve the conflict
resolved below within the FSI driver and allow the application of the
dmaeengine conversion that depends on this resolution.
Linux 3.3-rc4
Conflicts:
sound/soc/sh/fsi.c
Diffstat (limited to 'include/sound/sh_fsi.h')
0 files changed, 0 insertions, 0 deletions