From: Felipe Balbi <felipe.balbi@nokia.com>
Date: Thu, 5 Mar 2009 19:27:11 +0000 (+0000)
Subject: input: twl4030-pwrbutton: avoid merge conflicts
X-Git-Tag: v2.6.29-omap1~50
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1e2ac5195c19b440b0b095262e11b54c093916ee;p=pandora-kernel.git

input: twl4030-pwrbutton: avoid merge conflicts

sync up with the version going upstream.

Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
---

Reading git-diff-tree failed