Merge 3.12-rc3 into driver-core-next

We want the driver core and sysfs fixes in here to make merges and
development easier.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --cc drivers/base/core.c
Simple merge

diff --cc kernel/events/core.c
Simple merge

diff --cc lib/kobject.c
Simple merge