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

Merge tag 'v3.5-rc5' into regulator-drivers 

Linux 3.5-rc5 collides with further development.

Conflicts:
	drivers/regulator/tps65023-regulator.c
parents f141822b 6887a413
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment