Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild

* git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild: (40 commits)
  kbuild: trivial fixes in Makefile
  kbuild: adding symbols in Kconfig and defconfig to TAGS
  kbuild: replace abort() with exit(1)
  kbuild: support for %.symtypes files
  kbuild: fix silentoldconfig recursion
  kbuild: add option for stripping modules while installing them
  kbuild: kill some false positives from modpost
  kbuild: export-symbol usage report generator
  kbuild: fix make -rR breakage
  kbuild: append -dirty for updated but uncommited changes
  kbuild: append git revision for all untagged commits
  kbuild: fix module.symvers parsing in modpost
  kbuild: ignore make's built-in rules & variables
  kbuild: bugfix with initramfs
  kbuild: modpost build fix
  kbuild: check license compatibility when building modules
  kbuild: export-type enhancement to modpost.c
  kbuild: add dependency on kernel.release to the package targets
  kbuild: `make kernelrelease' speedup
  kconfig: KCONFIG_OVERWRITECONFIG
  ...

3 files changed, 8 insertions, 8 deletions

diff --git a/drivers/mtd/Kconfig b/drivers/mtd/Kconfig
index 5ac265dde423..1344ad7a4b14 100644
--- a/drivers/mtd/Kconfig
+++ b/drivers/mtd/Kconfig
@@ -86,14 +86,14 @@ config MTD_REDBOOT_DIRECTORY_BLOCK
           block and "-2" means the penultimate block.
 
 config MTD_REDBOOT_PARTS_UNALLOCATED
-        bool "  Include unallocated flash regions"
+        bool "Include unallocated flash regions"
         depends on MTD_REDBOOT_PARTS
         help
           If you need to register each unallocated flash region as a MTD
           'partition', enable this option.
 
 config MTD_REDBOOT_PARTS_READONLY
-        bool "  Force read-only for RedBoot system images"
+        bool "Force read-only for RedBoot system images"
         depends on MTD_REDBOOT_PARTS
         help
           If you need to force read-only for 'RedBoot', 'RedBoot Config' and
diff --git a/drivers/mtd/maps/Kconfig b/drivers/mtd/maps/Kconfig
index 6bdaacc6d6f9..83d0b2a52527 100644
--- a/drivers/mtd/maps/Kconfig
+++ b/drivers/mtd/maps/Kconfig
@@ -212,7 +212,7 @@ config MTD_NETtel
           Support for flash chips on NETtel/SecureEdge/SnapGear boards.
 
 config MTD_ALCHEMY
-        tristate '  AMD Alchemy Pb1xxx/Db1xxx/RDK MTD support'
+        tristate "AMD Alchemy Pb1xxx/Db1xxx/RDK MTD support"
         depends on SOC_AU1X00
         help
           Flash memory access on AMD Alchemy Pb/Db/RDK Reference Boards
diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
index 44728ae3fe77..c84b02aec1f3 100644
--- a/drivers/scsi/Kconfig
+++ b/drivers/scsi/Kconfig
@@ -1169,7 +1169,7 @@ config SCSI_NCR_Q720
           you do not have this SCSI card, so say N.
 
 config SCSI_NCR53C8XX_DEFAULT_TAGS
-        int "  default tagged command queue depth"
+        int "default tagged command queue depth"
         depends on SCSI_ZALON || SCSI_NCR_Q720
         default "8"
         ---help---
@@ -1195,7 +1195,7 @@ config SCSI_NCR53C8XX_DEFAULT_TAGS
           There is no safe option other than using good SCSI devices.
 
 config SCSI_NCR53C8XX_MAX_TAGS
-        int "  maximum number of queued commands"
+        int "maximum number of queued commands"
         depends on SCSI_ZALON || SCSI_NCR_Q720
         default "32"
         ---help---
@@ -1212,7 +1212,7 @@ config SCSI_NCR53C8XX_MAX_TAGS
           There is no safe option and the default answer is recommended.
 
 config SCSI_NCR53C8XX_SYNC
-        int "  synchronous transfers frequency in MHz"
+        int "synchronous transfers frequency in MHz"
         depends on SCSI_ZALON || SCSI_NCR_Q720
         default "20"
         ---help---
@@ -1246,7 +1246,7 @@ config SCSI_NCR53C8XX_SYNC
           terminations and SCSI conformant devices.
 
 config SCSI_NCR53C8XX_PROFILE
-        bool "  enable profiling"
+        bool "enable profiling"
         depends on SCSI_ZALON || SCSI_NCR_Q720
         help
           This option allows you to enable profiling information gathering.
@@ -1257,7 +1257,7 @@ config SCSI_NCR53C8XX_PROFILE
           The normal answer therefore is N.
 
 config SCSI_NCR53C8XX_NO_DISCONNECT
-        bool "  not allow targets to disconnect"
+        bool "not allow targets to disconnect"
         depends on (SCSI_ZALON || SCSI_NCR_Q720) && SCSI_NCR53C8XX_DEFAULT_TAGS=0
         help
           This option is only provided for safety if you suspect some SCSI