git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
8f59511
8bf9be5
)
Merge branch 'for-v3.19/gpmc-omap' of github.com:rogerq/linux into omap-for-v3.19...
author
Tony Lindgren
<tony@atomide.com>
Tue, 4 Nov 2014 01:45:36 +0000
(17:45 -0800)
committer
Tony Lindgren
<tony@atomide.com>
Tue, 4 Nov 2014 01:45:36 +0000
(17:45 -0800)
Conflicts:
arch/arm/mach-omap2/gpmc.c
Trivial merge