diff options
| author | Mark Brown <broonie@kernel.org> | 2014-11-17 16:41:11 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-11-17 16:41:11 +0000 |
| commit | cf9a7f7823c67243da44da2ac47ca944a3108282 (patch) | |
| tree | 76f5645cf1508f061ead34f6582f1b2dbf32b06a /arch/sparc/prom/cif.S | |
| parent | 643aa2c595d1869aa150e0ba5f2a3f18fd6820e6 (diff) | |
| parent | 96927ac96d7658b35a4f0f3dcdb8c6b74472a3ea (diff) | |
| parent | 62e6a3b6f4e1f9b96fa66ab1cdf2ffd8594df9e9 (diff) | |
| parent | c251ea7bd7a04f1f2575467e0de76e803cf59149 (diff) | |
Merge remote-tracking branches 'asoc/fix/rt5670', 'asoc/fix/samsung' and 'asoc/fix/sgtl5000' into asoc-linus