input: twl4030-pwrbutton: avoid merge conflicts
authorFelipe Balbi <felipe.balbi@nokia.com>
Thu, 5 Mar 2009 19:27:11 +0000 (19:27 +0000)
committerTony Lindgren <tony@atomide.com>
Thu, 5 Mar 2009 23:52:34 +0000 (15:52 -0800)
sync up with the version going upstream.

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

No differences found