Skip to content
GitLab
Commit 0cab71e7 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'spi/fix/s3c64xx' into spi-s3c64xx 

Conflicts:
	drivers/spi/spi-s3c64xx.c
parents 7d5f880b 3e2bd64d
Hide whitespace changes
Inline Side-by-side
Supports Markdown
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