diff options
author | Mark Brown <broonie@linaro.org> | 2014-02-11 12:08:27 +0000 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2014-02-11 12:08:27 +0000 |
commit | cf20662db4dfade737015036fa9c63e888350c82 (patch) | |
tree | 328bbed74bb803f2265a272e4c61f3d77fc78202 /security | |
parent | 797d0dec8aab6b3a3ac22eaa27ea298bf4ab37e4 (diff) | |
parent | e9305331f64ab9e5210baa4307355635c5e849f4 (diff) | |
parent | f7db1588d6028c97c098bb6445eaabc56a25fed8 (diff) | |
parent | e290c3434b70b2eb200f9a54d992b7c4fd938879 (diff) |
Merge remote-tracking branches 'spi/fix/doc', 'spi/fix/nuc900' and 'spi/fix/rspi' into spi-linus