Merge with ../linux-2.6

diff --cc Makefile
Simple merge

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/mach-omap1/fpga.c
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/media/video/Kconfig
Simple merge

diff --cc drivers/mmc/mmc.c
index 4c68df91b7d8faf37c16812563d2850803bfd17b,0a8165974ba763abebeb0519434f849ea8876413..dc4d3ad613fec49e65f4b4be8064ea831ecf0a4f
--- 1/drivers/mmc/mmc.c
--- 2/drivers/mmc/mmc.c
+++ b/drivers/mmc/mmc.c
@@@ -474,8 -484,8 +484,9 @@@ static void mmc_power_up(struct mmc_hos
        int bit = fls(host->ocr_avail) - 1;
  
        host->ios.vdd = bit;
 +      host->ios.clock = host->f_min;
        host->ios.bus_mode = MMC_BUSMODE_OPENDRAIN;
+       host->ios.chip_select = MMC_CS_DONTCARE;
        host->ios.power_mode = MMC_POWER_UP;
        host->ops->set_ios(host, &host->ios);
  

diff --cc drivers/serial/8250.c
Simple merge

diff --cc init/do_mounts.c
Simple merge