git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
a2cb960
21235bd
)
Merge branch 'fixes-gpio-to-irq' into fixes
author
Tony Lindgren
<tony@atomide.com>
Thu, 29 Mar 2012 17:16:04 +0000
(10:16 -0700)
committer
Tony Lindgren
<tony@atomide.com>
Thu, 29 Mar 2012 17:16:04 +0000
(10:16 -0700)
Conflicts:
arch/arm/mach-omap1/board-htcherald.c
arch/arm/mach-omap2/board-rx51-peripherals.c
arch/arm/plat-omap/include/plat/gpio.h
drivers/input/serio/ams_delta_serio.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff