git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b775e64 b6ae5dc)
Merge branch 'devicetree/next-overlay' into devicetree/next
authorGrant Likely <grant.likely@linaro.org>
Mon, 11 Aug 2014 13:06:23 +0000 (14:06 +0100)
committerGrant Likely <grant.likely@linaro.org>
Mon, 11 Aug 2014 13:06:23 +0000 (14:06 +0100)
Conflicts:
drivers/of/testcase-data/testcases.dts


Trivial merge
Pandora Kernel Repository