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

author Tony Lindgren <tony@atomide.com>

Fri, 22 Dec 2006 21:22:09 +0000 (13:22 -0800)

committer Tony Lindgren <tony@atomide.com>

Fri, 22 Dec 2006 21:22:09 +0000 (13:22 -0800)
author Tony Lindgren <tony@atomide.com>
Fri, 22 Dec 2006 21:22:09 +0000 (13:22 -0800)
committer Tony Lindgren <tony@atomide.com>
Fri, 22 Dec 2006 21:22:09 +0000 (13:22 -0800)
diff --cc Makefile
Simple merge
diff --cc kernel/printk.c
Simple merge
author	Tony Lindgren <tony@atomide.com>
	Fri, 22 Dec 2006 21:22:09 +0000 (13:22 -0800)
committer	Tony Lindgren <tony@atomide.com>
	Fri, 22 Dec 2006 21:22:09 +0000 (13:22 -0800)
		1	2
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
kernel/printk.c	patch \|	diff1 \|	diff2 \|	blob \| history