git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
51216ac
3c82e22
)
Merge branch 'omap_fixes_31' of git://git.pwsan.com/linux-2.6
author
Tony Lindgren
<tony@atomide.com>
Sun, 16 Aug 2009 15:56:38 +0000
(18:56 +0300)
committer
Tony Lindgren
<tony@atomide.com>
Sun, 16 Aug 2009 15:56:38 +0000
(18:56 +0300)
Conflicts:
arch/arm/mach-omap2/mux.c
arch/arm/plat-omap/include/mach/mux.h
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff