diff options
author | Mark Brown <broonie@kernel.org> | 2015-08-31 14:45:23 +0100 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-08-31 14:45:23 +0100 |
commit | af211211e39f59575854d5976a4e301c8c21d4bc (patch) | |
tree | 652ba79ab37b9d1383f75a18bcf31e7da1f4042b /drivers | |
parent | c13dcf9f2d6f5f06ef1bf79ec456df614c5e058b (diff) | |
parent | 43a0da25c0949f6dba0a8d6296907263f1b97ddd (diff) | |
parent | 26a67ec47a4c58fe79c6421c3dc3d697d322d2d6 (diff) | |
parent | 9176c6657b5c313cf504d157e6d91496ee5c8708 (diff) | |
parent | 5f74db105b1c0980c9863e7a7d1bc0525e0316e8 (diff) | |
parent | 38d6211e8565af5855385825a4fdc7261eb3740e (diff) | |
parent | 74346841e6f5df5f7b83d5904435d273c507dba6 (diff) |
Merge remote-tracking branches 'spi/fix/bcm2835', 'spi/fix/bitbang', 'spi/fix/img-spfi', 'spi/fix/omap2-mcspi', 'spi/fix/orion' and 'spi/fix/xilinx' into spi-linus