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

author Tony Lindgren <tony@atomide.com>

Tue, 13 Jun 2006 17:21:48 +0000 (10:21 -0700)

committer Tony Lindgren <tony@atomide.com>

Tue, 13 Jun 2006 17:21:48 +0000 (10:21 -0700)
author Tony Lindgren <tony@atomide.com>
Tue, 13 Jun 2006 17:21:48 +0000 (10:21 -0700)
committer Tony Lindgren <tony@atomide.com>
Tue, 13 Jun 2006 17:21:48 +0000 (10:21 -0700)
diff --cc Makefile
Simple merge
diff --cc drivers/net/irda/Kconfig
Simple merge
diff --cc include/linux/input.h
Simple merge
diff --cc net/ipv4/netfilter/Kconfig
Simple merge
author	Tony Lindgren <tony@atomide.com>
	Tue, 13 Jun 2006 17:21:48 +0000 (10:21 -0700)
committer	Tony Lindgren <tony@atomide.com>
	Tue, 13 Jun 2006 17:21:48 +0000 (10:21 -0700)
		1	2
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/net/irda/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
include/linux/input.h	patch \|	diff1 \|	diff2 \|	blob \| history
net/ipv4/netfilter/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history