Skip to content
Commit bc266185 authored by Grant Likely's avatar Grant Likely
Browse files

Merge branch 'spi/s3c64xx' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/misc 

Conflicts:
	drivers/spi/spi-s3c64xx.c
parents dcd6c922 b97b6621
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