Merge branch 'master' into for-next

diff --cc Documentation/device-mapper/dm-crypt.txt
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc arch/xtensa/configs/s6105_defconfig
Simple merge

diff --cc fs/direct-io.c
Simple merge

diff --cc fs/ext4/extents.c
Simple merge

diff --cc include/linux/mmzone.h
Simple merge

diff --cc init/Kconfig
Simple merge

diff --cc net/mac80211/tx.c
Simple merge