Merge remote-tracking branch 'driver-core/driver-core-next'

Conflicts:
	drivers/iommu/exynos-iommu.c

diff --cc drivers/crypto/nx/nx-842.c
Simple merge

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

diff --cc kernel/sysctl.c
Simple merge