Skip to content
Commit 263a5c8e authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 3.3-rc6 into driver-core-next 



This was done to resolve a conflict in the drivers/base/cpu.c file.

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parents 54d20f00 192cfd58
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