git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
209431e
ca125b5
)
Merge branch '4.0-rc1-prcm-cleanup-v6' of https://github.com/t-kristo/linux-pm into...
omap-for-v4.1/prcm-dts
author
Tony Lindgren
<tony@atomide.com>
Wed, 1 Apr 2015 19:24:29 +0000
(12:24 -0700)
committer
Tony Lindgren
<tony@atomide.com>
Wed, 1 Apr 2015 19:24:29 +0000
(12:24 -0700)
Conflicts:
arch/arm/boot/dts/dra7.dtsi
Trivial merge