tree dd825bf0aacccec33a7a21871b44453f472be245
parent 2de5c24466670b2bafc2aeebe55fdeff8be2d2c0
parent de46c33745f5e2ad594c72f2cf5f490861b16ce1
author H. Peter Anvin <hpa@zytor.com> 1180135263 -0700
committer H. Peter Anvin <hpa@zytor.com> 1180135263 -0700

Merge with v2.6.21

Conflicts:

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