Skip to content
GitLab
Explore
Sign in
Commit
b7a40242
authored
Oct 20, 2014
by
Mark Brown
Browse files
Merge branch 'fix/dw' of
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi
into spi-dw
Conflicts: drivers/spi/spi-dw-mid.c
parents
d26833bf
9c6de47d
Changes
1000
Hide whitespace changes
Inline
Side-by-side
Some changes are not shown.
For a faster browsing experience, only
20 of 1000+
files are shown. Download one of the files below to see all changes.
Plain diff
Email patch
Preview
0%
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