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

diff --cc arch/arm/Kconfig
Simple merge

diff --cc drivers/i2c/chips/isp1301_omap.c
Simple merge

diff --cc drivers/media/video/Makefile
index e054ce25912535ab05627f3cc71497228a2416c3,82060f9909d89db008fa0c5c48dc32b46d5b0cc3..febce335a117b02ee4f2e6c2c87a3f4857abce9b
--- 1/drivers/media/video/Makefile
--- 2/drivers/media/video/Makefile
+++ b/drivers/media/video/Makefile
@@@ -54,6 -55,7 +55,8 @@@ obj-$(CONFIG_VIDEO_BTCX)  += btcx-risc.
  obj-$(CONFIG_VIDEO_TVEEPROM) += tveeprom.o
  
  obj-$(CONFIG_VIDEO_M32R_AR_M64278) += arv.o
 +obj-$(CONFIG_VIDEO_OMAP_CAMERA) += omap/
  
+ obj-$(CONFIG_VIDEO_DECODER)     += saa7115.o cx25840/ saa7127.o
+ 
  EXTRA_CFLAGS += -I$(srctree)/drivers/media/dvb/dvb-core

diff --cc drivers/mtd/maps/omap_nor.c
Simple merge

diff --cc drivers/net/smc91x.c
Simple merge

diff --cc drivers/net/smc91x.h
Simple merge

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

diff --cc drivers/usb/gadget/omap_udc.c
Simple merge

diff --cc kernel/printk.c
Simple merge