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

diff --cc Makefile
Simple merge

diff --cc arch/arm/Makefile
Simple merge

diff --cc drivers/char/watchdog/Kconfig
Simple merge

diff --cc drivers/media/video/Kconfig
Simple merge

diff --cc drivers/media/video/Makefile
Simple merge

diff --cc drivers/net/smc91x.c
Simple merge

diff --cc drivers/net/smc91x.h
Simple merge

diff --cc drivers/video/Kconfig
Simple merge

diff --cc include/linux/fb.h
Simple merge