Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

L

Linux
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

6e695472

Unverified Commit 6e695472 authored 7 years ago by Mark Brown

Downloads
- Plain Diff

Merge remote-tracking branches 'spi/topic/imx', 'spi/topic/mxs',...

Merge remote-tracking branches 'spi/topic/imx', 'spi/topic/mxs', 'spi/topic/orion', 'spi/topic/rspi' and 'spi/topic/s3c64xx' into spi-next

parents 704c1455 ffd4db9e b7969caf f747c310 219a7bc5 4132b8b9

Loading

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

Documentation/devicetree/bindings/spi/spi-rspi.txt 4 additions, 1 deletion

Documentation/devicetree/bindings/spi/spi-rspi.txt
drivers/spi/spi-imx.c 214 additions, 42 deletions

drivers/spi/spi-imx.c
drivers/spi/spi-mxs.c 110 additions, 10 deletions

drivers/spi/spi-mxs.c
drivers/spi/spi-orion.c 0 additions, 1 deletion

drivers/spi/spi-orion.c
drivers/spi/spi-rspi.c 2 additions, 4 deletions

drivers/spi/spi-rspi.c
drivers/spi/spi-s3c64xx.c 0 additions, 3 deletions

drivers/spi/spi-s3c64xx.c

with 330 additions and 61 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment