diff options
author | Mark Brown <broonie@kernel.org> | 2014-10-03 19:33:42 +0400 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2014-10-03 19:33:42 +0400 |
commit | bab4d751f70bcecdcaad56dad9785224a5a6f9db (patch) | |
tree | 1ff0959fcc37611e1d13298d08e936065f33521d /drivers/spi/spi-rockchip.c | |
parent | 899d81b974ec7b3fd0f875c578bd91e89212742f (diff) | |
parent | db4fa45ed3182d8206af241811dfc99369ffa849 (diff) | |
parent | 468e0f47ed87350408ddac0e942fbf9a723408f9 (diff) | |
parent | 6089af775a4b4ea5237648de650dda548cb841c2 (diff) | |
parent | e221cc99bee4494a99aa8d8525cd7776092ced05 (diff) | |
parent | 9593e61582248fe30b099d59d15edd5a30f87add (diff) | |
download | linux-bab4d751f70bcecdcaad56dad9785224a5a6f9db.tar.xz |
Merge remote-tracking branches 'spi/topic/pl022', 'spi/topic/pxa2xx', 'spi/topic/rspi', 'spi/topic/sh-msiof' and 'spi/topic/sirf' into spi-next