From: Tony Lindgren <tony@atomide.com>
Date: Fri, 28 Mar 2008 10:59:38 +0000 (+0200)
Subject: Merge current mainline tree into linux-omap tree
X-Git-Tag: v2.6.25-omap1~92
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6f19ae4ef12a69feba69bf5234c43c5ff7b9b970;p=pandora-kernel.git

Merge current mainline tree into linux-omap tree

Merge branches 'master' and 'linus'

Conflicts:

	arch/arm/plat-omap/Makefile
	arch/arm/plat-omap/gpio.c
	drivers/i2c/busses/i2c-omap.c
	include/asm-arm/arch-omap/dsp_common.h
---

6f19ae4ef12a69feba69bf5234c43c5ff7b9b970
Reading git-diff-tree failed