]> pilppa.org Git - linux-2.6-omap-h63xx.git/commit
projects / linux-2.6-omap-h63xx.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 30aa645) | patch
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)
commit1e2ac5195c19b440b0b095262e11b54c093916ee
tree019fbfb68d7d978e5f09235f2c38e7f6a76affb5tree | snapshot
parent30aa6458dfb749f4387bb808cb3f8ab7b78341e5commit | diff
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>
drivers/input/misc/Kconfig diff | blob | history
drivers/input/misc/twl4030-pwrbutton.c diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.