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

diff --cc Makefile
Simple merge

diff --cc arch/arm/Kconfig
Simple merge

diff --cc drivers/Kconfig
Simple merge

diff --cc drivers/net/irda/Makefile
index a18d18ef63c8e9f23456ae37717e5c78dbfb629e,c1ce2398efeaa0854f98cef201c4aa6f55144a7b..ddf3c2e3289427a4b976703d64b3b814096fa599
--- 1/drivers/net/irda/Makefile
--- 2/drivers/net/irda/Makefile
+++ b/drivers/net/irda/Makefile
@@@ -44,8 -44,6 +44,8 @@@ obj-$(CONFIG_MCP2120_DONGLE)  += mcp2120
  obj-$(CONFIG_ACT200L_DONGLE)  += act200l-sir.o
  obj-$(CONFIG_MA600_DONGLE)    += ma600-sir.o
  obj-$(CONFIG_TOIM3232_DONGLE) += toim3232-sir.o
 +obj-$(CONFIG_OMAP_IR)         += omap-ir.o
 +
  
  # The SIR helper module
- sir-dev-objs := sir_dev.o sir_dongle.o sir_kthread.o
+ sir-dev-objs := sir_dev.o sir_dongle.o

diff --cc drivers/serial/8250.c
index 1d212bae03b35d5c00f5b26217bb1353ad2f7ca6,bbf78aaf9e01f074d15bf6db21042feb9dec5591..14c0fcd6af6e072f663608b92d7acc38f4eda8a8
--- 1/drivers/serial/8250.c
--- 2/drivers/serial/8250.c
+++ b/drivers/serial/8250.c
@@@ -1930,12 -1934,10 +1959,15 @@@ static int serial8250_request_std_resou
        unsigned int size = 8 << up->port.regshift;
        int ret = 0;
  
 +#ifdef CONFIG_ARCH_OMAP
 +      if (is_omap_port((unsigned int)up->port.membase))
 +              size = 0x16 << up->port.regshift;
 +#endif
 +
        switch (up->port.iotype) {
+       case UPIO_AU:
+               size = 0x100000;
+               /* fall thru */
        case UPIO_MEM:
                if (!up->port.mapbase)
                        break;

diff --cc drivers/video/Kconfig
Simple merge

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

diff --cc sound/oss/Kconfig
Simple merge