diff options
| author | Mark Brown <broonie@linaro.org> | 2014-03-23 14:00:35 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-03-23 14:00:35 +0000 |
| commit | ebec909345bbb1e2d06cd0d94f65664edcc0f208 (patch) | |
| tree | 2b1eb0ec25104225b7d883bbea8ed7b53e6c3e74 /drivers/nfc | |
| parent | 017d9491ce203c620ad1377f46a3ce78d554b2de (diff) | |
| parent | 7272e051157ccd5871b5d939548d0ba5a94a2965 (diff) | |
| parent | d31a33dd7792c7d6c11fda226a3b9e4fb7f86f95 (diff) | |
| parent | 1555b652970e541fa1cb80c61ffc696bbfb92bb7 (diff) | |
| parent | 313c84b2736b26c77af7c7637e7dd72afde1b6cd (diff) | |
| parent | bde24030b5a2825ef198b2f092b7271e22fae142 (diff) | |
| parent | 591d14f00796a4250d800d316e3db1fea8a57e20 (diff) | |
Merge remote-tracking branches 'asoc/fix/cs42l51', 'asoc/fix/cs42l52', 'asoc/fix/cs42l73', 'asoc/fix/rcar', 'asoc/fix/spear' and 'asoc/fix/tegra' into asoc-linus