diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-01-08 12:55:18 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-01-08 12:55:18 +1100 |
| commit | 4a206227af07fccdbe87663c45132f87ae15fca0 (patch) | |
| tree | 1a54bd6e1280a7c11e3eba64d78eb7011976a0a0 /arch/arm | |
| parent | ae598919ce583d057a3df13a3d86d3a59a55d5b0 (diff) | |
| parent | 929559be6d2c494e25bb58b730da4a78c1459e7b (diff) | |
Merge remote-tracking branch 'sound/for-next'
Conflicts:
sound/soc/fsl/fsl_ssi.c
Diffstat (limited to 'arch/arm')
0 files changed, 0 insertions, 0 deletions