Skip to content
Commit b7a40242 authored by Mark Brown's avatar 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
Hide whitespace changes
Inline Side-by-side
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