Merge 3.12-rc3 into driver-core-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 30 Sep 2013 01:29:23 +0000 (18:29 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 30 Sep 2013 01:29:23 +0000 (18:29 -0700)
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>
1  2 
drivers/base/core.c
kernel/events/core.c
lib/kobject.c

Simple merge
Simple merge
diff --cc lib/kobject.c
Simple merge