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

author Tony Lindgren <tony@atomide.com>

Wed, 20 Sep 2006 16:33:10 +0000 (19:33 +0300)

committer Tony Lindgren <tony@atomide.com>

Wed, 20 Sep 2006 16:33:10 +0000 (19:33 +0300)
author Tony Lindgren <tony@atomide.com>
Wed, 20 Sep 2006 16:33:10 +0000 (19:33 +0300)
committer Tony Lindgren <tony@atomide.com>
Wed, 20 Sep 2006 16:33:10 +0000 (19:33 +0300)
diff --cc Makefile
Simple merge
diff --cc drivers/mtd/nand/Kconfig
Simple merge
author	Tony Lindgren <tony@atomide.com>
	Wed, 20 Sep 2006 16:33:10 +0000 (19:33 +0300)
committer	Tony Lindgren <tony@atomide.com>
	Wed, 20 Sep 2006 16:33:10 +0000 (19:33 +0300)
		1	2
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/mtd/nand/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history