Merge ../linux-2.6

diff --cc Makefile
Simple merge

diff --cc drivers/Makefile
Simple merge

diff --cc drivers/char/Kconfig
Simple merge

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

diff --cc drivers/mmc/mmc.c
Simple merge

diff --cc drivers/mmc/mmc_block.c
Simple merge

diff --cc drivers/video/Kconfig
Simple merge

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