diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-01-17 16:47:32 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-01-17 16:47:32 +0000 |
| commit | 9135f6db09aa9d186f05d41e9c516ec8e3550d78 (patch) | |
| tree | 5deebbc7e9dd74a000f649e51d17e3f07c20b138 /arch/xtensa/boot | |
| parent | a421296840379aee7d00ec4a28ecfe7e697a0a44 (diff) | |
| parent | b05f5c13d5bc2fa9945c9534f8881396555290a9 (diff) | |
Merge branch 'mxc-audio' into for-2.6.34
Conflicts:
arch/arm/plat-mxc/Makefile (dual add)
sound/soc/imx/mx27vis_wm8974.c (API updates & removal)
Diffstat (limited to 'arch/xtensa/boot')
0 files changed, 0 insertions, 0 deletions