Merge branches 'kbuild/kconfig' and 'kbuild/misc' into kbuild/for-next

diff --cc scripts/config
index f65a44a7886a7192d3c9cea6457e1aa8dee4d42f,9e984bc96e188cb2e3d086c7b811e3edb2d6df64,f65a44a7886a7192d3c9cea6457e1aa8dee4d42f..ee355394f4ef76eeb6d6f74dac00729d8cc942e3
--- 1/scripts/config
--- 2/scripts/config
--- 3/scripts/config
+++ b/scripts/config
@@@@ -153,10 -125,10 -153,10 +153,10 @@@@ while [ "$1" != "" ] ; d
                        if [ $? != 0 ] ; then
                                echo undef
                        else
 -                              V="${V/#CONFIG_$ARG=/}"
 +                              V="${V/#${CONFIG_}$ARG=/}"
                                V="${V/#\"/}"
                                V="${V/%\"/}"
- -                             V="${V/\\\"/\"}"
+ +                             V="${V//\\\"/\"}"
                                echo "${V}"
                        fi
                fi