s390: update defconfigs

Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

diff --cc arch/s390/configs/default_defconfig
Simple merge

diff --cc arch/s390/configs/gcov_defconfig
Simple merge

diff --cc arch/s390/configs/performance_defconfig
Simple merge

diff --cc arch/s390/configs/zfcpdump_defconfig
Simple merge

diff --cc arch/s390/defconfig
Simple merge