Merge 3.15-rc6 into driver-core-next

We want the kernfs fixes in this branch as well for testing.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --cc fs/kernfs/file.c
Simple merge

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