From: Tony Lindgren <tony@atomide.com>
Date: Thu, 1 Oct 2009 20:11:06 +0000 (-0700)
Subject: Merge branch 'omap-fixes-testing'
X-Git-Tag: v2.6.32-omap1~11^2^2~1^2^2^2^2^2~8^2^2~18^2~2^2^2~2^2^2^2^2~16^2^2~4
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c9928ccc13831a994868ac0c75529a0f5b788e75;p=pandora-kernel.git

Merge branch 'omap-fixes-testing'

Conflicts:
	drivers/mfd/twl4030-core.c
---

c9928ccc13831a994868ac0c75529a0f5b788e75
Reading git-diff-tree failed