From: Tony Lindgren <tony@atomide.com>
Date: Sat, 14 Nov 2009 02:54:25 +0000 (-0800)
Subject: omap: Changes to avoid merge conflicts with MFD tree
X-Git-Tag: v2.6.32-omap1~11^2^2
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0cf12e3ce3358f9a282244e0fd65af20cca38bba;p=pandora-kernel.git

omap: Changes to avoid merge conflicts with MFD tree

This will be reverted as a fix after the merge window.

Signed-off-by: Tony Lindgren <tony@atomide.com>
---

Reading git-diff-tree failed