Merge branch 'master' into for-next
authorJiri Kosina <jkosina@suse.cz>
Tue, 15 Feb 2011 09:24:31 +0000 (10:24 +0100)
committerJiri Kosina <jkosina@suse.cz>
Tue, 15 Feb 2011 09:24:31 +0000 (10:24 +0100)
commit0a9d59a2461477bd9ed143c01af9df3f8f00fa81
treedf997d1cfb0786427a0df1fbd6f0640fa4248cf4
parenta23ce6da9677d245aa0aadc99f4197030350ab54
parent795abaf1e4e188c4171e3cd3dbb11a9fcacaf505
Merge branch 'master' into for-next
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