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

author Tony Lindgren <tony@atomide.com>

Tue, 7 Feb 2006 03:36:15 +0000 (19:36 -0800)

committer Tony Lindgren <tony@atomide.com>

Tue, 7 Feb 2006 03:36:15 +0000 (19:36 -0800)
author Tony Lindgren <tony@atomide.com>
Tue, 7 Feb 2006 03:36:15 +0000 (19:36 -0800)
committer Tony Lindgren <tony@atomide.com>
Tue, 7 Feb 2006 03:36:15 +0000 (19:36 -0800)
diff --cc Makefile
Simple merge
diff --cc drivers/Makefile
Simple merge
diff --cc drivers/char/Kconfig
Simple merge
diff --cc drivers/mmc/mmc.c
Simple merge
diff --cc drivers/serial/8250.c
Simple merge
author	Tony Lindgren <tony@atomide.com>
	Tue, 7 Feb 2006 03:36:15 +0000 (19:36 -0800)
committer	Tony Lindgren <tony@atomide.com>
	Tue, 7 Feb 2006 03:36:15 +0000 (19:36 -0800)
		1	2
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/char/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/mmc/mmc.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/serial/8250.c	patch \|	diff1 \|	diff2 \|	blob \| history