git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
dd775ae
cca6430
)
Merge branch 'io_chain_devel_3.4' of git://git.pwsan.com/linux-2.6 into prm
author
Tony Lindgren
<tony@atomide.com>
Tue, 3 Apr 2012 16:46:37 +0000
(09:46 -0700)
committer
Tony Lindgren
<tony@atomide.com>
Tue, 3 Apr 2012 16:46:37 +0000
(09:46 -0700)
Conflicts:
arch/arm/mach-omap2/pm34xx.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff