summaryrefslogtreecommitdiffstats
path: root/block/blk-settings.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman2014-05-23 03:13:53 +0200
committerGreg Kroah-Hartman2014-05-23 03:13:53 +0200
commitcbfef53360ea88fa7ef9f80def778fba9b05d21e (patch)
tree9e23ee08206ec0304e25e8a93eabc2d5bcd8ae9c /block/blk-settings.c
parentMerge 3.15-rc3 into staging-next (diff)
parentLinux 3.15-rc6 (diff)
downloadkernel-qcow2-linux-cbfef53360ea88fa7ef9f80def778fba9b05d21e.tar.gz
kernel-qcow2-linux-cbfef53360ea88fa7ef9f80def778fba9b05d21e.tar.xz
kernel-qcow2-linux-cbfef53360ea88fa7ef9f80def778fba9b05d21e.zip
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>
Diffstat (limited to 'block/blk-settings.c')
0 files changed, 0 insertions, 0 deletions