diff options
author | Mark Brown <broonie@kernel.org> | 2015-11-04 11:02:04 +0000 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-11-04 11:02:04 +0000 |
commit | 076fcb17dd0e3598edad4fa5a980d1596a9f8f48 (patch) | |
tree | 74677737e783e95f8a5cf2886cb217d31f83bbb1 /drivers/spi/spi-bcm2835.c | |
parent | 8c603485752ae844748db94148adc2b46e621d28 (diff) | |
parent | b7a2a1c0b67283442a06fcc679cba0683914f794 (diff) | |
parent | e8646580cc9a6ae24ab3d05f90e71334f50cdedf (diff) | |
parent | 0beb0a6da8896da14287b1caa77596057690901a (diff) | |
parent | ddf0e1c20d8b72c409e4c954002069445babc762 (diff) | |
parent | 07bce09e11f5007635d7f9e6bc55679dd6ed18bd (diff) |
Merge remote-tracking branches 'spi/topic/ath97', 'spi/topic/atmel', 'spi/topic/au1550', 'spi/topic/bcm2835' and 'spi/topic/bcm2835aux' into spi-next