tree bc6c2a185421f14417873fb2a6b256e1439b092d
parent 0ca8d33423989ac9d51cc7ab5996833dc905862a
parent 39403865d2e4590802553370a56c9ab93131e4ee
author H. Peter Anvin <hpa@zytor.com> 1180137580 -0700
committer H. Peter Anvin <hpa@zytor.com> 1180137580 -0700

Merge with v2.6.22-rc1

Conflicts:

	fs/nfs/mount_clnt.c
	fs/nfs/nfsroot.c
	init/do_mounts.c
	init/do_mounts_initrd.c
	net/ipv4/ipconfig.c
	scripts/gen_initramfs_list.sh