Merge 4.1-rc7 into driver-core-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 8 Jun 2015 17:19:40 +0000 (10:19 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 8 Jun 2015 17:19:40 +0000 (10:19 -0700)
commit987aec39a74373c55c3bedd5c3c83896d78fd0a2
tree66aba6d4f166f269be95fe4d267d57efe533aefd
parent303cda0ea7c1c33701812ccb80d37083a4093c7c
parentd4a4f75cd8f29cd9464a5a32e9224a91571d6649
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>
Documentation/ABI/testing/sysfs-devices-system-cpu
MAINTAINERS
arch/powerpc/mm/hugetlbpage.c
drivers/base/cacheinfo.c
kernel/module.c