From: Tony Lindgren <tony@atomide.com>
Date: Wed, 22 Aug 2007 07:48:45 +0000 (-0700)
Subject: Merge omap-upstream
X-Git-Tag: v2.6.23-omap1~149
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=e7b6b5b678a4864b66cd609310c864bf8b2f66fe;p=linux-2.6-omap-h63xx.git

Merge omap-upstream

Merge branches 'master' and 'omap-upstream'

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-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/plat-omap/Makefile
	arch/arm/plat-omap/common.c
	arch/arm/plat-omap/timer32k.c
	drivers/i2c/chips/isp1301_omap.c
	drivers/i2c/chips/menelaus.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
---

e7b6b5b678a4864b66cd609310c864bf8b2f66fe
diff --cc drivers/i2c/chips/menelaus.c
index 624413b0881,d9c92c5e007..9d759644ae0
--- a/drivers/i2c/chips/menelaus.c
+++ b/drivers/i2c/chips/menelaus.c
@@@ -1,3 -1,3 +1,4 @@@
++
  /*
   * Copyright (C) 2004 Texas Instruments, Inc.
   *