Merge ../linux-2.6

author Tony Lindgren <tony@atomide.com>

Sat, 11 Nov 2006 00:21:32 +0000 (02:21 +0200)

committer Tony Lindgren <tony@atomide.com>

Sat, 11 Nov 2006 00:21:32 +0000 (02:21 +0200)
author Tony Lindgren <tony@atomide.com>
Sat, 11 Nov 2006 00:21:32 +0000 (02:21 +0200)
committer Tony Lindgren <tony@atomide.com>
Sat, 11 Nov 2006 00:21:32 +0000 (02:21 +0200)
diff --cc Makefile
Simple merge
diff --cc kernel/printk.c
Simple merge
author	Tony Lindgren <tony@atomide.com>
	Sat, 11 Nov 2006 00:21:32 +0000 (02:21 +0200)
committer	Tony Lindgren <tony@atomide.com>
	Sat, 11 Nov 2006 00:21:32 +0000 (02:21 +0200)
		1	2
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
kernel/printk.c	patch \|	diff1 \|	diff2 \|	blob \| history