Commit c4366889 authored by Dave Jones's avatar Dave Jones
Browse files

Merge ../linus

Conflicts:

	drivers/cpufreq/cpufreq.c
parents db2fb9db e1036502
Supports Markdown
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