diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-10-17 07:33:23 (GMT) |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-10-17 07:33:23 (GMT) |
commit | ef5347c63f9d19c4185fe06d73ffb8f4d55606bf (patch) | |
tree | c6367ebf301d0bba3dd8553fd43915ecfb87495d /drivers/spi | |
parent | 5015a2e1679f9f56b574f3aab7006517106da83c (diff) | |
parent | b308fb208e23c3e765cefa45eb868c40c5b9c3e7 (diff) | |
parent | 0384e90b853357d24935c65ba0e1bdd27faa6e58 (diff) | |
parent | 44968466cfb969f960dbe422bbc785117f497729 (diff) | |
parent | 9f667bff0f48d01a4474fa879cb384331584a4ee (diff) | |
download | linux-ef5347c63f9d19c4185fe06d73ffb8f4d55606bf.tar.xz |
Merge branch 'spi-linus', remote-tracking branches 'misc/spi/bcm63xx', 'misc/spi/mcspi', 'misc/spi/mxs' and 'misc/spi/s3c64xx' into spi-next