diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-03-10 22:51:07 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-03-10 22:51:07 +0300 |
| commit | f455dfb106916d855d59686fe16575c2ceb2cb2a (patch) | |
| tree | de705fc7037b03c75490871c4a4ce1ab659a7c7a /include/linux | |
| parent | cbf1146d5ee113152c5cdeb54ff9d4b2f0c91736 (diff) | |
| download | linux-f455dfb106916d855d59686fe16575c2ceb2cb2a.tar.xz | |
ASoC: Fix up merge with the ARM tree
The same change has been made with the final lines in slightly differnet
orders.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'include/linux')
0 files changed, 0 insertions, 0 deletions