diff options
author | Mark Brown <broonie@kernel.org> | 2015-03-24 10:38:44 -0700 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-03-24 10:38:44 -0700 |
commit | 072ac04d31b14647e9835b1a699ebe3413e5d222 (patch) | |
tree | 854b4e29c39f4e078f10fe0e15dd61825dd2ad14 | |
parent | bc465aa9d045feb0e13b4a8f32cc33c1943f62d6 (diff) | |
parent | 854d2f241d71f6ca08ccde30e6c7c2e403363e52 (diff) | |
parent | 391949b6f02121371e3d7d9082c6d17fd9853034 (diff) | |
parent | 12cb89e37a0c25fae7a0f1d2e4985558db9d0b13 (diff) |
Merge remote-tracking branches 'spi/fix/dw', 'spi/fix/queue' and 'spi/fix/qup' into spi-linus