diff options
| author | Philippe Langlais <philippe.langlais@stericsson.com> | 2011-12-06 11:59:13 +0100 |
|---|---|---|
| committer | Philippe Langlais <philippe.langlais@stericsson.com> | 2011-12-06 11:59:13 +0100 |
| commit | 923bd829759171a3ae299c98ca8a0b1cf1ade9f2 (patch) | |
| tree | 744d21883fac44f739968bb222b7d42c57a95ddd /sound/soc/kirkwood | |
| parent | 1d7b293daecc09ec904bc4fc43db8ce7e57250c8 (diff) | |
| parent | f18c7ad48a191f2ecd7262e4f079b77f066b0a95 (diff) | |
Merge branch 'audio' into linux-stable-ux500-3.1
Conflicts:
drivers/misc/Makefile
Diffstat (limited to 'sound/soc/kirkwood')
0 files changed, 0 insertions, 0 deletions