From: Tony Lindgren <tony@atomide.com>
Date: Tue, 27 Jan 2009 21:07:22 +0000 (-0800)
Subject: Merge current mainline tree into linux-omap tree
X-Git-Tag: v2.6.29-omap1~118
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=96584c6afee1ab7ea408e6f9331ab64399f821d3;p=pandora-kernel.git

Merge current mainline tree into linux-omap tree

Merge branches 'master' and 'linus'

Conflicts:

	arch/arm/configs/omap3_pandora_defconfig
	arch/arm/configs/omap_2430sdp_defconfig
	arch/arm/configs/omap_ldp_defconfig
	arch/arm/configs/overo_defconfig
	arch/arm/mach-omap2/board-apollon.c
	arch/arm/mach-omap2/board-omap3beagle.c
	arch/arm/plat-omap/dma.c
	drivers/misc/Makefile
	drivers/mmc/host/omap_hsmmc.c
	drivers/spi/Kconfig
	include/linux/i2c-id.h
---

96584c6afee1ab7ea408e6f9331ab64399f821d3
Reading git-diff-tree failed