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

author Tony Lindgren <tony@atomide.com>

Tue, 20 Jun 2006 16:34:48 +0000 (09:34 -0700)

committer Tony Lindgren <tony@atomide.com>

Tue, 20 Jun 2006 16:34:48 +0000 (09:34 -0700)
author Tony Lindgren <tony@atomide.com>
Tue, 20 Jun 2006 16:34:48 +0000 (09:34 -0700)
committer Tony Lindgren <tony@atomide.com>
Tue, 20 Jun 2006 16:34:48 +0000 (09:34 -0700)
diff --cc Makefile
Simple merge
diff --cc drivers/char/Makefile
Simple merge
author	Tony Lindgren <tony@atomide.com>
	Tue, 20 Jun 2006 16:34:48 +0000 (09:34 -0700)
committer	Tony Lindgren <tony@atomide.com>
	Tue, 20 Jun 2006 16:34:48 +0000 (09:34 -0700)
		1	2
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/char/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history