projects / platform / kernel / linux-amlogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 0dfeada 52cfa7e)
Merge branch 'orion/dt' into next/dt
authorOlof Johansson <olof@lixom.net>
Mon, 26 Nov 2012 09:27:27 +0000 (01:27 -0800)
committerOlof Johansson <olof@lixom.net>
Mon, 26 Nov 2012 09:27:31 +0000 (01:27 -0800)
commit61da823ab9f1e554da58f1c9f75931829582ad4f
treebb55b966f3da3de6ff0ccad70fca3dc16c35786dtree | snapshot
parent0dfeada90989833d0144b4df25d2b9ce3746624fcommit | diff
parent52cfa7e54b480661e20dfd8788a24cfcba8a0ca5commit | diff
Merge branch 'orion/dt' into next/dt

Merge in orion's cleanup branch together with the DT contents.  Ideally
the cleanup branch should have been the base for the DT branch to avoid
these, but that was missed when first merging. So we're doing it now to
reduce the amount of silly conflicts due to internal tree organization.

Signed-off-by: Olof Johansson <olof@lixom.net>
Domain: System / Kernel;