Merge remote-tracking branch 'kdbus/kdbus'

Conflicts:
	Documentation/Makefile

diff --cc Documentation/Makefile
index bc0548201755e1a8d29614bccbd78fcbbe5a34ae,5e3fde632d03fbfe2282f49612e2ad9fec9b87e8..e2127a76b5d6da191e1661c9681d9a8035d7bbfc
--- 1/Documentation/Makefile
--- 2/Documentation/Makefile
+++ b/Documentation/Makefile
@@@ -1,4 -1,4 +1,4 @@@
 -subdir-y := accounting arm auxdisplay blackfin connector \
 +subdir-y := accounting auxdisplay blackfin connector \
-       filesystems filesystems ia64 laptops mic misc-devices \
+       filesystems filesystems ia64 kdbus laptops mic misc-devices \
        networking pcmcia prctl ptp spi timers vDSO video4linux \
        watchdog

diff --cc Documentation/ioctl/ioctl-number.txt
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc Makefile
Simple merge

diff --cc include/uapi/linux/Kbuild
Simple merge

diff --cc include/uapi/linux/magic.h
Simple merge

diff --cc init/Kconfig
Simple merge

diff --cc tools/testing/selftests/Makefile
Simple merge