From: Tony Lindgren <tony@atomide.com>
Date: Mon, 6 Aug 2007 12:44:03 +0000 (-0700)
Subject: Merge omap-upstream
X-Git-Tag: v2.6.23-omap1~285
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5669d107117726fb431567917c2b40646dbd7fd2;p=pandora-kernel.git

Merge omap-upstream

Merge branches 'master' and 'omap-upstream'

Conflicts:

	arch/arm/Kconfig
	arch/arm/boot/compressed/head.S
	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-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-keys.c
	arch/arm/mach-omap2/board-apollon.c
	arch/arm/mach-omap2/board-h4.c
	arch/arm/mach-omap2/board-n800-audio.c
	arch/arm/mach-omap2/board-n800-dsp.c
	arch/arm/mach-omap2/board-n800-usb.c
	arch/arm/mach-omap2/board-n800.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/mach-omap2/sleep.S
	arch/arm/mm/proc-v7.S
	arch/arm/plat-omap/Makefile
	arch/arm/plat-omap/common.c
	arch/arm/plat-omap/timer32k.c
	drivers/char/watchdog/omap_wdt.c
	drivers/i2c/chips/Makefile
	drivers/i2c/chips/menelaus.c
	drivers/rtc/Kconfig
	drivers/rtc/Makefile
	drivers/spi/Kconfig
	drivers/spi/Makefile
	drivers/spi/omap2_mcspi.c
	drivers/video/omap/Kconfig
	drivers/video/omap/Makefile
	drivers/video/omap/blizzard.c
	drivers/video/omap/dispc.c
	drivers/video/omap/lcd_inn1510.c
	drivers/video/omap/lcd_inn1610.c
	drivers/video/omap/lcd_palmte.c
	drivers/video/omap/lcd_palmtt.c
	drivers/video/omap/lcd_palmz71.c
	drivers/video/omap/lcd_sx1.c
	drivers/video/omap/lcdc.c
	drivers/video/omap/omapfb_main.c
	drivers/video/omap/rfbi.c
	drivers/video/omap/sossi.c
	include/asm-arm/arch-omap/board-2430sdp.h
	include/asm-arm/arch-omap/eac.h
	include/asm-arm/arch-omap/gpio.h
	include/asm-arm/arch-omap/hardware.h
	include/asm-arm/arch-omap/io.h
	include/asm-arm/arch-omap/menelaus.h
	include/asm-arm/arch-omap/mmc.h
	include/asm-arm/arch-omap/omap24xx.h
	include/asm-arm/arch-omap/onenand.h
	include/asm-arm/arch-omap/pm.h
	include/linux/input.h
	kernel/printk.c
---

5669d107117726fb431567917c2b40646dbd7fd2
Reading git-diff-tree failed