diff options
| author | Mark Brown <broonie@kernel.org> | 2015-08-30 15:55:54 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-08-30 15:55:54 +0100 |
| commit | 532161e6ccbd1c5ac3a2ea9dc60c8e253cd22fa5 (patch) | |
| tree | 892d8435678ab6ed4ae15aaa72ee2a8effd6bf96 /drivers/ide/macide.c | |
| parent | d781c23e9b46f33c1c6c07febae36f37a11f9d4d (diff) | |
| parent | 1af2cc64b18c29f1d774caa7e592c781bee6a7eb (diff) | |
| parent | 41a5fefeff21bb08438383c0a6b5a06045775969 (diff) | |
| parent | ac1125daf02b81cabb19f35963906335e3d4a155 (diff) | |
| parent | 1c0beb27443c98257a5bced2978f2556f2ae1709 (diff) | |
| parent | a5afdc5bf53995385b621361c976b8a29e07f701 (diff) | |
Merge remote-tracking branches 'asoc/topic/rcar', 'asoc/topic/reg-default', 'asoc/topic/rl6231', 'asoc/topic/rockchip' and 'asoc/topic/rt286' into asoc-next