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

diff --cc Makefile
Simple merge

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/Makefile
index fe923006d968e817ccd61facd2167eecabc89566,6f8e84c1c1f2330d207951bdb8098cb99d11b15c..3da406c8e4e3157dc3d335ed244d97bf6a2f15e9
--- 1/arch/arm/Makefile
--- 2/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@@ -63,10 -63,10 +63,10 @@@ tune-$(CONFIG_CPU_SA110)   :=-mtune=stron
  tune-$(CONFIG_CPU_SA1100)     :=-mtune=strongarm1100
  tune-$(CONFIG_CPU_XSCALE)     :=$(call cc-option,-mtune=xscale,-mtune=strongarm110) -Wa,-mcpu=xscale
  tune-$(CONFIG_CPU_XSC3)               :=$(call cc-option,-mtune=xscale,-mtune=strongarm110) -Wa,-mcpu=xscale
 -tune-$(CONFIG_CPU_V6)         :=$(call cc-option,-mtune=arm1136j-s,-mtune=strongarm)
 +tune-$(CONFIG_CPU_V6)         :=$(call cc-option,-mtune=arm1136j-s,-mtune=arm1136jfs)
  
  ifeq ($(CONFIG_AEABI),y)
- CFLAGS_ABI    :=-mabi=aapcs -mno-thumb-interwork
+ CFLAGS_ABI    :=-mabi=aapcs-linux -mno-thumb-interwork
  else
  CFLAGS_ABI    :=$(call cc-option,-mapcs-32,-mabi=apcs-gnu) $(call cc-option,-mno-thumb-interwork,)
  endif

diff --cc drivers/char/Kconfig
Simple merge

diff --cc drivers/char/Makefile
index 0320635d46515e9ae4590d61cc66eeb70293cdfd,f5b01c6d498e10c66efa1becb1cb06a9cd0fd265..8d4a36e947d22d18162667615c360368ade7b84c
--- 1/drivers/char/Makefile
--- 2/drivers/char/Makefile
+++ b/drivers/char/Makefile
@@@ -65,10 -65,8 +65,9 @@@ obj-$(CONFIG_GEN_RTC)                += genrtc.
  obj-$(CONFIG_EFI_RTC)         += efirtc.o
  obj-$(CONFIG_SGI_DS1286)      += ds1286.o
  obj-$(CONFIG_SGI_IP27_RTC)    += ip27-rtc.o
 +obj-$(CONFIG_OMAP_RTC)                += omap-rtc.o
  obj-$(CONFIG_DS1302)          += ds1302.o
  obj-$(CONFIG_S3C2410_RTC)     += s3c2410-rtc.o
- obj-$(CONFIG_RTC_VR41XX)      += vr41xx_rtc.o
  ifeq ($(CONFIG_GENERIC_NVRAM),y)
    obj-$(CONFIG_NVRAM) += generic_nvram.o
  else

diff --cc drivers/i2c/busses/Kconfig
Simple merge

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

diff --cc drivers/usb/gadget/Kconfig
Simple merge

diff --cc drivers/video/Kconfig
Simple merge

diff --cc net/ipv4/netfilter/Kconfig
Simple merge