Merge 3.15-rc3 into staging-next

author Greg Kroah-Hartman <[email protected]>

Mon, 28 Apr 2014 04:36:39 +0000 (21:36 -0700)

committer Greg Kroah-Hartman <[email protected]>

Mon, 28 Apr 2014 04:36:39 +0000 (21:36 -0700)
author Greg Kroah-Hartman <[email protected]>
Mon, 28 Apr 2014 04:36:39 +0000 (21:36 -0700)
committer Greg Kroah-Hartman <[email protected]>
Mon, 28 Apr 2014 04:36:39 +0000 (21:36 -0700)
diff --cc fs/kernfs/dir.c
Simple merge
diff --cc fs/kernfs/file.c
Simple merge
author	Greg Kroah-Hartman <[email protected]>
	Mon, 28 Apr 2014 04:36:39 +0000 (21:36 -0700)
committer	Greg Kroah-Hartman <[email protected]>
	Mon, 28 Apr 2014 04:36:39 +0000 (21:36 -0700)
		1	2
fs/kernfs/dir.c	patch \|	diff1 \|	diff2 \|	blob \| history
fs/kernfs/file.c	patch \|	diff1 \|	diff2 \|	blob \| history