1. 31 Oct, 2007 3 commits
  2. 29 Oct, 2007 2 commits
    • Tony Lindgren's avatar
      ARM: OMAP: Misc compile fixes after updating to current mainline tree · dff99b71
      Tony Lindgren authored
      Misc compile fixes after updating to current mainline tree
      Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
      dff99b71
    • Tony Lindgren's avatar
      Merge current mainline tree into linux-omap tree · 19ea3371
      Tony Lindgren authored
      Merge branches 'master' and 'linus'
      
      Conflicts:
      
      	arch/arm/configs/omap_h2_1610_defconfig
      	arch/arm/configs/omap_osk_5912_defconfig
      	arch/arm/mach-omap1/board-h2.c
      	arch/arm/mach-omap1/board-h3.c
      	arch/arm/mach-omap1/board-nokia770.c
      	arch/arm/mach-omap1/board-palmte.c
      	arch/arm/mach-omap1/board-palmtt.c
      	arch/arm/mach-omap1/board-palmz71.c
      	arch/arm/mach-omap1/board-sx1.c
      	arch/arm/mach-omap2/Kconfig
      	arch/arm/mach-omap2/Makefile
      	arch/arm/mach-omap2/board-2430sdp.c
      	arch/arm/mach-omap2/board-apollon.c
      	arch/arm/mach-omap2/board-h4.c
      	arch/arm/mach-omap2/devices.c
      	arch/arm/mach-omap2/gpmc.c
      	arch/arm/mach-omap2/id.c
      	arch/arm/mach-omap2/io.c
      	arch/arm/mach-omap2/irq.c
      	arch/arm/mach-omap2/memory.c
      	arch/arm/mach-omap2/mux.c
      	arch/arm/mach-omap2/pm.c
      	arch/arm/nwfpe/entry.S
      	arch/arm/plat-omap/Makefile
      	drivers/char/watchdog/omap_wdt.c
      	drivers/char/watchdog/omap_wdt.h
      	drivers/i2c/busses/i2c-omap.c
      	drivers/i2c/chips/menelaus.c
      	drivers/input/keyboard/Kconfig
      	drivers/input/keyboard/Makefile
      	drivers/media/video/Kconfig
      	drivers/media/video/Makefile
      	drivers/media/video/tcm825x.c
      	drivers/media/video/v4l2-int-device.c
      	drivers/mtd/onenand/onenand_base.c
      	drivers/usb/gadget/Kconfig
      	drivers/video/Makefile
      	include/asm-arm/arch-omap/board-2430sdp.h
      	include/asm-arm/arch-omap/hardware.h
      	include/asm-arm/arch-omap/io.h
      	include/asm-arm/arch-omap/omap24xx.h
      	include/linux/connector.h
      19ea3371
  3. 23 Oct, 2007 35 commits