From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 8 Dec 2009 16:15:29 +0000 (-0800)
Subject: Merge branch 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind... 
X-Git-Tag: v2.6.33-rc1~381
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=1c496784a0d317535f846ddb2c93a08ba936266b;p=linux.git

Merge branch 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6

* 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6: (149 commits)
  arm: omap: Add omap3_defconfig
  AM35xx: Defconfig for AM3517 EVM board
  AM35xx: Add support for AM3517 EVM board
  omap: 3630sdp: defconfig creation
  omap: 3630sdp: introduce 3630 sdp board support
  omap3: Add defconfig for IGEP v2 board
  omap3: Add minimal IGEP v2 support
  omap3: Add CompuLab CM-T35 defconfig
  omap3: Add CompuLab CM-T35 board support
  omap3: rx51: Add wl1251 wlan driver support
  omap3: rx51: Add SDRAM init
  omap1: Add default kernel configuration for Herald
  omap1: Add board support and LCD for HTC Herald
  omap: zoom2: update defconfig for LL_DEBUG_NONE
  omap: zoom3: defconfig creation
  omap3: zoom: Introduce zoom3 board support
  omap3: zoom: Drop i2c-1 speed to 2400
  omap3: zoom: rename zoom2 name to generic zoom
  omap3: zoom: split board file for software reuse
  omap3evm: MIgrate to smsc911x ethernet driver
  ...

Fix trivial conflict (two unrelated config options added next to each
other) in arch/arm/mach-omap2/Makefile
---

1c496784a0d317535f846ddb2c93a08ba936266b
diff --cc arch/arm/mach-omap2/Makefile
index e141cabcfcce,59b0ccce3099..32548a4510c5
--- a/arch/arm/mach-omap2/Makefile
+++ b/arch/arm/mach-omap2/Makefile
@@@ -44,9 -44,9 +44,12 @@@ obj-$(CONFIG_ARCH_OMAP4)		+= cm4xxx.
  obj-$(CONFIG_ARCH_OMAP2)		+= clock24xx.o
  obj-$(CONFIG_ARCH_OMAP3)		+= clock34xx.o
  
 +# EMU peripherals
 +obj-$(CONFIG_OMAP3_EMU)		+= emu.o
 +
+ obj-$(CONFIG_OMAP_MBOX_FWK)		+= mailbox_mach.o
+ mailbox_mach-objs			:= mailbox.o
+ 
  iommu-y					+= iommu2.o
  iommu-$(CONFIG_ARCH_OMAP3)		+= omap3-iommu.o