git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
33fc21e
cf1a929
)
Merge tag 'omap-fixes-a-for-3.4rc' of git://git.kernel.org/pub/scm/linux/kernel/git...
author
Tony Lindgren
<tony@atomide.com>
Wed, 4 Apr 2012 23:47:25 +0000
(16:47 -0700)
committer
Tony Lindgren
<tony@atomide.com>
Wed, 4 Apr 2012 23:47:25 +0000
(16:47 -0700)
Conflicts:
arch/arm/mach-omap2/omap_hwmod.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff