diff options
author | Mark Brown <broonie@kernel.org> | 2016-07-24 22:08:22 +0100 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2016-07-24 22:08:22 +0100 |
commit | ac3e62b8208b655bfee8d33c38664c5ca1ff8a61 (patch) | |
tree | 2146c662693e7cdb7d2b19635934e9cabc2e4fd1 /include/net/bond_3ad.h | |
parent | e350817b7cfb8cce9db8ac4344744e0b4fbe52d0 (diff) | |
parent | 63d49afefc87d1503956185e94fad43140c2ba9e (diff) | |
parent | 0ba1870f886501beca0e2c19ec367a85ae201ea8 (diff) | |
parent | 57c624ae1c0aa631f11768992a74998c531a7fee (diff) | |
parent | 57c2b0ddd14d8831cbaab855373fe8797812ea53 (diff) | |
parent | 33d5097dbf650b84238c6ebdfea4a335f64f9608 (diff) |
Merge remote-tracking branches 'spi/topic/octeon', 'spi/topic/omap2-mcspi', 'spi/topic/orion', 'spi/topic/pic32' and 'spi/topic/pic32-sqi' into spi-next