Merge branch 'master' into for-next
Jiri Kosina [Tue, 15 Feb 2011 09:24:31 +0000 (10:24 +0100)]
1  2 
Documentation/device-mapper/dm-crypt.txt
MAINTAINERS
arch/xtensa/configs/s6105_defconfig
fs/direct-io.c
fs/ext4/extents.c
include/linux/mmzone.h
init/Kconfig
net/mac80211/tx.c

diff --cc MAINTAINERS
Simple merge
Simple merge
diff --cc fs/direct-io.c
Simple merge
Simple merge
Simple merge
diff --cc init/Kconfig
Simple merge
Simple merge