diff options
author | Mark Brown <broonie@kernel.org> | 2015-04-11 23:09:25 +0100 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-04-11 23:09:25 +0100 |
commit | 165f2288e1fc82df0c429942f2b7aef69de17d72 (patch) | |
tree | e2c5a592d908a6b1eb82eb5290722a831c492d14 /drivers/spi/spi-qup.c | |
parent | 8afba181b90fbad372c420c302a57c0c4f9fdae4 (diff) | |
parent | 612762e82ae6058d69b4ce734598491bf030afe7 (diff) | |
parent | 76b17e6e4923e4138ed9a4d480cba148ff239dc9 (diff) | |
parent | c9bc3e8bf04225968f1cee34b50216263ed58000 (diff) | |
parent | 0744ea2a01cb75a750e8594b046102fc68fa45b3 (diff) | |
parent | b4e27545224e263d271a9d9aa8763357a7e40eaa (diff) | |
download | op-kernel-dev-165f2288e1fc82df0c429942f2b7aef69de17d72.zip op-kernel-dev-165f2288e1fc82df0c429942f2b7aef69de17d72.tar.gz |
Merge remote-tracking branches 'spi/topic/qup', 'spi/topic/rockchip', 'spi/topic/rspi', 'spi/topic/s3c64xx' and 'spi/topic/sc18is602' into spi-next