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

diff --cc Makefile
Simple merge

diff --cc arch/arm/mach-omap2/board-apollon.c
index ea12cc76239e267ada7826aec83f837c1f14dff9,878ff9181d0e5159477f5560e571da9cedecf91d..5e1cada561d80dfadb90620638a03568d88c99fd
--- 1/arch/arm/mach-omap2/board-apollon.c
--- 2/arch/arm/mach-omap2/board-apollon.c
+++ b/arch/arm/mach-omap2/board-apollon.c
@@@ -22,12 -22,9 +22,13 @@@
  #include <linux/mtd/mtd.h>
  #include <linux/mtd/partitions.h>
  #include <linux/mtd/onenand.h>
+ #include <linux/irq.h>
  #include <linux/interrupt.h>
  #include <linux/delay.h>
 +#include <linux/leds.h>
 +#include <linux/irq.h>
 +#include <linux/err.h>
 +#include <linux/clk.h>
  
  #include <asm/hardware.h>
  #include <asm/mach-types.h>

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