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

165f2288

Commit 165f2288 authored 9 years ago by Mark Brown

Downloads
- Plain Diff

Merge remote-tracking branches 'spi/topic/qup', 'spi/topic/rockchip',...

Merge remote-tracking branches 'spi/topic/qup', 'spi/topic/rockchip', 'spi/topic/rspi', 'spi/topic/s3c64xx' and 'spi/topic/sc18is602' into spi-next

parents 8afba181 612762e8 76b17e6e c9bc3e8b 0744ea2a b4e27545

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

Documentation/devicetree/bindings/spi/qcom,spi-qup.txt 8 additions, 0 deletions

Documentation/devicetree/bindings/spi/qcom,spi-qup.txt
Documentation/devicetree/bindings/spi/spi-rockchip.txt 4 additions, 0 deletions

Documentation/devicetree/bindings/spi/spi-rockchip.txt
drivers/spi/spi-qup.c 304 additions, 32 deletions

drivers/spi/spi-qup.c
drivers/spi/spi-rockchip.c 32 additions, 4 deletions

drivers/spi/spi-rockchip.c
drivers/spi/spi-rspi.c 117 additions, 7 deletions

drivers/spi/spi-rspi.c
drivers/spi/spi-s3c64xx.c 2 additions, 2 deletions

drivers/spi/spi-s3c64xx.c
drivers/spi/spi-sc18is602.c 1 addition, 1 deletion

drivers/spi/spi-sc18is602.c

with 468 additions and 46 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