Merge with ../linux-2.6

author Tony Lindgren <tony@atomide.com>

Tue, 9 Aug 2005 08:09:27 +0000 (01:09 -0700)

committer Tony Lindgren <tony@atomide.com>

Tue, 9 Aug 2005 08:09:27 +0000 (01:09 -0700)
author Tony Lindgren <tony@atomide.com>
Tue, 9 Aug 2005 08:09:27 +0000 (01:09 -0700)
committer Tony Lindgren <tony@atomide.com>
Tue, 9 Aug 2005 08:09:27 +0000 (01:09 -0700)
diff --cc Makefile
Simple merge
diff --cc drivers/input/touchscreen/Kconfig
Simple merge
author	Tony Lindgren <tony@atomide.com>
	Tue, 9 Aug 2005 08:09:27 +0000 (01:09 -0700)
committer	Tony Lindgren <tony@atomide.com>
	Tue, 9 Aug 2005 08:09:27 +0000 (01:09 -0700)
		1	2
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/input/touchscreen/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history