| commit | a2166ca5f3204794e8b59f01c93a0f1564e3e138 | [log] [tgz] |
|---|---|---|
| author | Grant Likely <grant.likely@linaro.org> | Sun Mar 29 08:59:58 2015 +0100 |
| committer | Grant Likely <grant.likely@linaro.org> | Sun Mar 29 08:59:58 2015 +0100 |
| tree | b667828c308ffd79f1b2bd8fc1da95e43dfef4e3 | |
| parent | 37791b6fbe7ab772020e714d34515f144fa981a0 [diff] | |
| parent | 01218bf14ee60d4a2d6c667ebdbba3ae9a7a1d66 [diff] |
Merge remote-tracking branch 'robh/for-next' into devicetree/next Conflicts: drivers/of/unittest.c