Skip to content
Commit 8e5d0661 authored by Mark Brown's avatar Mark Brown
Browse files

Merge tag 'v3.6-rc6' into spi-drivers 

Linux 3.6-rc6

Conflicts:
	drivers/spi/spi-omap2-mcspi.c
parents 39a6ac11 5698bd75
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