git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
9c1fe83
6acfd68
)
Merge branch 'omap7xx-fortony-rc1' of git://robotfuzz.com/linwizard-kernel into omap7...
author
Tony Lindgren
<tony@atomide.com>
Wed, 30 Sep 2009 19:11:46 +0000
(12:11 -0700)
committer
Tony Lindgren
<tony@atomide.com>
Wed, 30 Sep 2009 19:11:46 +0000
(12:11 -0700)
Conflicts:
arch/arm/plat-omap/gpio.c
Trivial merge