Merge branch 'stable/for-jens' of git://git.kernel.org/pub/scm/linux/kernel/git/konra...

diff --combined drivers/block/Kconfig
index 57212c5,a89ebf1..6f07ec1
--- 1/drivers/block/Kconfig
--- 2/drivers/block/Kconfig
+++ b/drivers/block/Kconfig
@@@ -256,21 -256,6 +256,21 @@@ config BLK_DEV_LOO
  
          Most users will answer N here.
  
 +config BLK_DEV_LOOP_MIN_COUNT
 +      int "Number of loop devices to pre-create at init time"
 +      depends on BLK_DEV_LOOP
 +      default 8
 +      help
 +        Static number of loop devices to be unconditionally pre-created
 +        at init time.
 +
 +        This default value can be overwritten on the kernel command
 +        line or with module-parameter loop.max_loop.
 +
 +        The historic default is 8. If a late 2011 version of losetup(8)
 +        is used, it can be set to 0, since needed loop devices can be
 +        dynamically allocated with the /dev/loop-control interface.
 +
  config BLK_DEV_CRYPTOLOOP
        tristate "Cryptoloop Support"
        select CRYPTO
@@@ -486,7 -471,7 +486,7 @@@ config XEN_BLKDEV_FRONTEN
          in another domain which drives the actual block device.
  
  config XEN_BLKDEV_BACKEND
-       tristate "Block-device backend driver"
+       tristate "Xen block-device backend driver"
        depends on XEN_BACKEND
        help
          The block-device backend driver allows the kernel to export its