Merge with /home/tmlind/src/kernel/linux-2.6

author Tony Lindgren <tony@atomide.com>

Mon, 21 Nov 2005 18:18:03 +0000 (10:18 -0800)

committer Tony Lindgren <tony@atomide.com>

Mon, 21 Nov 2005 18:18:03 +0000 (10:18 -0800)
author Tony Lindgren <tony@atomide.com>
Mon, 21 Nov 2005 18:18:03 +0000 (10:18 -0800)
committer Tony Lindgren <tony@atomide.com>
Mon, 21 Nov 2005 18:18:03 +0000 (10:18 -0800)
diff --cc Makefile
Simple merge
diff --cc drivers/net/smc91x.c
Simple merge
author	Tony Lindgren <tony@atomide.com>
	Mon, 21 Nov 2005 18:18:03 +0000 (10:18 -0800)
committer	Tony Lindgren <tony@atomide.com>
	Mon, 21 Nov 2005 18:18:03 +0000 (10:18 -0800)
		1	2
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/net/smc91x.c	patch \|	diff1 \|	diff2 \|	blob \| history