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

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

Linux 3.6-rc6

Conflicts (overlap between moving code that accesses registers around
and factoring the register access out into a SSP layer):
	drivers/mmc/host/mxs-mmc.c
parents e64d07a2 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