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

author Stephen Rothwell <sfr@canb.auug.org.au>

Fri, 16 May 2014 04:50:35 +0000 (14:50 +1000)

committer Stephen Rothwell <sfr@canb.auug.org.au>

Fri, 16 May 2014 04:50:35 +0000 (14:50 +1000)
author Stephen Rothwell <sfr@canb.auug.org.au>
Fri, 16 May 2014 04:50:35 +0000 (14:50 +1000)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Fri, 16 May 2014 04:50:35 +0000 (14:50 +1000)
diff --cc fs/kernfs/file.c
Simple merge
diff --cc include/linux/kernfs.h
Simple merge
diff --cc kernel/sysctl.c
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 16 May 2014 04:50:35 +0000 (14:50 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 16 May 2014 04:50:35 +0000 (14:50 +1000)
		1	2
fs/kernfs/file.c	patch \|	diff1 \|	diff2 \|	blob \| history
include/linux/kernfs.h	patch \|	diff1 \|	diff2 \|	blob \| history
kernel/sysctl.c	patch \|	diff1 \|	diff2 \|	blob \| history