Merge with ../linux-2.6

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/mach-omap1/leds-h2p2-debug.c
Simple merge

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

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

diff --cc drivers/video/Kconfig
Simple merge

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