Merge with v2.6.21

Conflicts:

	drivers/block/Kconfig
	include/linux/socket.h