Merge 3.15-rc6 into driver-core-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 23 May 2014 01:13:53 +0000 (10:13 +0900)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 23 May 2014 01:13:53 +0000 (10:13 +0900)
commitcbfef53360ea88fa7ef9f80def778fba9b05d21e
tree9e23ee08206ec0304e25e8a93eabc2d5bcd8ae9c
parentd35cc56ddfc948d8df1aa6d41ac345fcec01854d
parent4b660a7f5c8099d88d1a43d8ae138965112592c7
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>
fs/kernfs/file.c
include/linux/kernfs.h