OSDN Git Service

Merge remote-tracking branch 'kdbus/kdbus'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 28 Aug 2015 05:02:45 +0000 (15:02 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 28 Aug 2015 05:02:45 +0000 (15:02 +1000)
1  2 
Documentation/ioctl/ioctl-number.txt
MAINTAINERS
Makefile
include/uapi/linux/Kbuild
init/Kconfig
tools/testing/selftests/Makefile

Simple merge
diff --cc MAINTAINERS
Simple merge
diff --cc Makefile
Simple merge
Simple merge
diff --cc init/Kconfig
Simple merge
@@@ -4,8 -4,8 +4,9 @@@ TARGETS += efivarf
  TARGETS += exec
  TARGETS += firmware
  TARGETS += ftrace
 +TARGETS += futex
  TARGETS += kcmp
+ TARGETS += kdbus
  TARGETS += memfd
  TARGETS += memory-hotplug
  TARGETS += mount