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

author Tony Lindgren <tony@atomide.com>

Wed, 25 Oct 2006 19:04:55 +0000 (22:04 +0300)

committer Tony Lindgren <tony@atomide.com>

Wed, 25 Oct 2006 19:04:55 +0000 (22:04 +0300)
author Tony Lindgren <tony@atomide.com>
Wed, 25 Oct 2006 19:04:55 +0000 (22:04 +0300)
committer Tony Lindgren <tony@atomide.com>
Wed, 25 Oct 2006 19:04:55 +0000 (22:04 +0300)
diff --cc Makefile
Simple merge
diff --cc drivers/Kconfig
Simple merge
diff --cc drivers/char/Kconfig
Simple merge
diff --cc drivers/char/watchdog/Kconfig
Simple merge
diff --cc drivers/char/watchdog/Makefile
Simple merge
diff --cc drivers/media/video/Kconfig
Simple merge
author	Tony Lindgren <tony@atomide.com>
	Wed, 25 Oct 2006 19:04:55 +0000 (22:04 +0300)
committer	Tony Lindgren <tony@atomide.com>
	Wed, 25 Oct 2006 19:04:55 +0000 (22:04 +0300)
		1	2
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/char/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/char/watchdog/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/char/watchdog/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/media/video/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history