Skip to content

L
linux
Commit 5d0fe636 authored by Mark Brown's avatar Mark Brown
Browse files
Options

Merge branch 'fix/bcm2835-code' of... 

Merge branch 'fix/bcm2835-code' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi into spi-bcm2835

Conflicts:
	drivers/spi/spi-bcm2835.c
parents a750b124 145367ba
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 0 deletions
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7