git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
435d39f
a5bee30
)
Merge branch 'cleanup' into testing-misc
author
Tony Lindgren
<tony@atomide.com>
Wed, 29 Feb 2012 00:52:55 +0000
(16:52 -0800)
committer
Tony Lindgren
<tony@atomide.com>
Wed, 29 Feb 2012 00:52:55 +0000
(16:52 -0800)
Conflicts:
arch/arm/mach-omap1/gpio16xx.c
drivers/gpio/gpio-omap.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff