tree 4f049e339d522b2ab0ba3bed3ec217e4bbc83d35
parent 54d20f006ceff1f2f1e69d0e54049b6c0765c039
parent 192cfd58774b4d17b2fe8bdc77d89c2ef4e0591d
author Greg Kroah-Hartman <gregkh@linuxfoundation.org> 1331325353 -0800
committer Greg Kroah-Hartman <gregkh@linuxfoundation.org> 1331325353 -0800

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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>