Skip to content
Commit bb2c018b authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'linus' into cpus4096 



Conflicts:

	drivers/acpi/processor_throttling.c

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parents 82638844 5b664cb2
Expand all 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