Merge branch 'spi-linus', remote-tracking branches 'misc/spi/bcm63xx', 'misc/spi/mcspi', 'misc/spi/mxs' and 'misc/spi/s3c64xx' into spi-next

Browse source

...

This commit is contained in:

Mark Brown 2012-10-17 16:33:23 +09:00

parent 5015a2e167 b308fb208e 0384e90b85 44968466cf 9f667bff0f

commit ef5347c63f

6 changed files with 49 additions and 35 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

4

Documentation/devicetree/bindings/spi/omap-spi.txt

View file

16

drivers/spi/spi-bcm63xx.c

View file

3

drivers/spi/spi-mxs.c

View file

25

drivers/spi/spi-omap2-mcspi.c

View file

32

drivers/spi/spi-s3c64xx.c

View file

4

include/linux/platform_data/spi-omap2-mcspi.h

View file