diff options
author | Mark Brown <broonie@linaro.org> | 2014-03-24 11:16:27 +0000 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2014-03-24 11:16:27 +0000 |
commit | dd52600fb05a645bff029938e811ad4086503854 (patch) | |
tree | 8545614e1efa7b950765604339d4963591e59dc0 /drivers/mfd/ucb1x00-ts.c | |
parent | 017d9491ce203c620ad1377f46a3ce78d554b2de (diff) | |
parent | 7272e051157ccd5871b5d939548d0ba5a94a2965 (diff) | |
parent | d31a33dd7792c7d6c11fda226a3b9e4fb7f86f95 (diff) | |
parent | 1555b652970e541fa1cb80c61ffc696bbfb92bb7 (diff) | |
parent | 6fa387b2ed268952d50940b0e24c573063a1dcfe (diff) | |
parent | bde24030b5a2825ef198b2f092b7271e22fae142 (diff) | |
parent | 591d14f00796a4250d800d316e3db1fea8a57e20 (diff) | |
download | blackbird-op-linux-dd52600fb05a645bff029938e811ad4086503854.tar.gz blackbird-op-linux-dd52600fb05a645bff029938e811ad4086503854.zip |
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