Merge branch 'generic_lookup_helpers' into driver-core-next

This was on a separate branch so that others can pull it in.

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

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

diff --cc include/linux/device.h
Simple merge