diff options
author | James Hogan <james.hogan@imgtec.com> | 2015-02-25 01:39:23 +0000 |
---|---|---|
committer | James Hogan <james.hogan@imgtec.com> | 2015-03-20 19:48:10 +0000 |
commit | 2e382ce83d75b1f031ca956b65fae879823eccec (patch) | |
tree | 049a0252069112e993d86a2d0ff8a5933272f764 | |
parent | a208c3b1e3fac18ad383365b6a7e9d475480497b (diff) | |
parent | ddf4034ba8d7e9d7c607a155336b49376fc9cc90 (diff) | |
parent | 67b2c4ddc6477ef8b9f4de6bf332b02b513e3e22 (diff) | |
parent | db317601f1ea36252527f3fc5d10ab9be69d2e3d (diff) | |
parent | 427ef7c4acdd28a72dbf55b2f49fe29bc79390fa (diff) | |
download | tz1090-wip-tz1090.tar.gz |
Merge branches 'tz1090_8250_tolerance', 'tz1090_clk_specified', 'tz1090_clks' (early part), 'tz1090_metag' (early part) and 'img_wdt_fixes' into tmpwip-tz1090
$ git merge tz1090_8250_tolerance tz1090_clk_specified tz1090_clks~2 tz1090_metag~ img_wdt_fixes