summaryrefslogtreecommitdiffstats
path: root/drivers/block
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2017-05-02 22:09:35 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2017-05-02 22:09:35 -0400
commit89c9fea3c8034cdb2fd745f551cde0b507fd6893 (patch)
treec20880998ad9a212c83818eb3b62eaacab45a1fa /drivers/block
parent76f1948a79b26d5f57a5ee9941876b745c6baaea (diff)
parent6fbc8798d9461c0ff22fab9fbaddde13de815941 (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial tree updates from Jiri Kosina. * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: tty: fix comment for __tty_alloc_driver() init/main: properly align the multi-line comment init/main: Fix double "the" in comment Fix dead URLs to ftp.kernel.org drivers: Clean up duplicated email address treewide: Fix typo in xml/driver-api/basics.xml tools/testing/selftests/powerpc: remove redundant CFLAGS in Makefile: "-Wall -O2 -Wall" -> "-O2 -Wall" selftests/timers: Spelling s/privledges/privileges/ HID: picoLCD: Spelling s/REPORT_WRTIE_MEMORY/REPORT_WRITE_MEMORY/ net: phy: dp83848: Fix Typo UBI: Fix typos Documentation: ftrace.txt: Correct nice value of 120 priority net: fec: Fix typo in error msg and comment treewide: Fix typos in printk
Diffstat (limited to 'drivers/block')
-rw-r--r--drivers/block/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig
index 19df4918e37e..d545abbd5378 100644
--- a/drivers/block/Kconfig
+++ b/drivers/block/Kconfig
@@ -219,7 +219,7 @@ config BLK_DEV_LOOP
219 219
220 To use the loop device, you need the losetup utility, found in the 220 To use the loop device, you need the losetup utility, found in the
221 util-linux package, see 221 util-linux package, see
222 <ftp://ftp.kernel.org/pub/linux/utils/util-linux/>. 222 <https://www.kernel.org/pub/linux/utils/util-linux/>.
223 223
224 The loop device driver can also be used to "hide" a file system in 224 The loop device driver can also be used to "hide" a file system in
225 a disk partition, floppy, or regular file, either using encryption 225 a disk partition, floppy, or regular file, either using encryption