Merge 4.1-rc7 into driver-core-next

We want the fixes in this branch as well for testing and merge
resolution.

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

diff --cc Documentation/ABI/testing/sysfs-devices-system-cpu
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc arch/powerpc/mm/hugetlbpage.c
Simple merge

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

diff --cc kernel/module.c
Simple merge