diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-19 20:26:16 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-19 20:26:16 -0800 |
commit | e32795503de02da4e7e74a5e039cc268f6a0ecfb (patch) | |
tree | 2520af6bb12359458846d73842733c7cd07416a3 /include | |
parent | dcd6a97d1d821335051cbf35b1e2be54955d6276 (diff) | |
parent | ab28698d33af05abab0bcf8021eafe38f7434f24 (diff) | |
parent | bc1008cf7d243cf6ad87b1e16d3dbbd8c8d6f35c (diff) | |
parent | d3601e56cf64a3f2df6f6380cccb3644274406e2 (diff) | |
download | linux-3.10-e32795503de02da4e7e74a5e039cc268f6a0ecfb.tar.gz linux-3.10-e32795503de02da4e7e74a5e039cc268f6a0ecfb.tar.bz2 linux-3.10-e32795503de02da4e7e74a5e039cc268f6a0ecfb.zip |
Merge tags 'dt-for-linus', 'gpio-for-linus' and 'spi-for-linus' of git://git.secretlab.ca/git/linux-2.6
Pull devicetree, gpio and spi bugfixes from Grant Likely:
"Device tree v3.8 bug fix:
- Fixes an undefined struct device build error and a missing symbol
export.
GPIO device driver bug fixes:
- gpio/mvebu-gpio: Make mvebu-gpio depend on OF_CONFIG
- gpio/ich: Add missing spinlock init
SPI device driver bug fixes:
- Most of this is bug fixes to the core code and the sh-hspi and
s3c64xx device drivers.
- There is also a patch here to add DT support to the Atmel driver.
This one should have been in the first round, but I missed it.
It's a low risk change contained within a single driver and the
Atmel maintainer has requested it."
* tag 'dt-for-linus' of git://git.secretlab.ca/git/linux-2.6:
of: define struct device in of_platform.h if !OF_DEVICE and !OF_ADDRESS
of: Fix export of of_find_matching_node_and_match()
* tag 'gpio-for-linus' of git://git.secretlab.ca/git/linux-2.6:
gpio/mvebu-gpio: Make mvebu-gpio depend on OF_CONFIG
gpio/ich: Add missing spinlock init
* tag 'spi-for-linus' of git://git.secretlab.ca/git/linux-2.6:
spi/sh-hspi: fix return value check in hspi_probe().
spi: fix tegra SPI binding examples
spi/atmel: add DT support
of/spi: Fix SPI module loading by using proper "spi:" modalias prefixes.
spi: Change FIFO flush operation and spi channel off
spi: Keep chipselect assertion during one message