Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
L
Linux
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
E-EXK4 - Operating System Group
projects
Linux
Commits
3086c9f6
Commit
3086c9f6
authored
11 years ago
by
Mark Brown
Browse files
Options
Downloads
Plain Diff
Merge branch 'spi/merge' of
git://git.secretlab.ca/git/linux
into spi-fix-grant
parents
c1be5a5b
0d2d0cc5
No related branches found
No related tags found
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
drivers/spi/spi-atmel.c
+2
-2
2 additions, 2 deletions
drivers/spi/spi-atmel.c
drivers/spi/spi-davinci.c
+1
-1
1 addition, 1 deletion
drivers/spi/spi-davinci.c
drivers/spi/spi.c
+6
-3
6 additions, 3 deletions
drivers/spi/spi.c
include/linux/spi/spi.h
+2
-2
2 additions, 2 deletions
include/linux/spi/spi.h
with
11 additions
and
8 deletions
Loading
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment
