tree f30bb2f491efc22f11b6ad3a8fa2b7f89026310c
parent 717e59aff2ce9d26a63063e2ab6cd64cc865730e
parent 606135a3081e045b677cde164a296c51f66c4633
author H. Peter Anvin <hpa@zytor.com> 1172972832 -0800
committer H. Peter Anvin <hpa@zytor.com> 1172972832 -0800

Merge with v2.6.21-rc2

Conflicts:

	init/Makefile
	init/main.c
	net/ipv4/ipconfig.c
	scripts/Kbuild.include
	scripts/gen_initramfs_list.sh