diff options
author | Daniel Lezcano <daniel.lezcano@linaro.org> | 2011-07-25 23:28:08 +0200 |
---|---|---|
committer | Daniel Lezcano <daniel.lezcano@linaro.org> | 2011-07-25 23:28:08 +0200 |
commit | d71cbaa0d625f5161e453a225bd8793c321908b8 (patch) | |
tree | ada2961f316af025c6eceba2d055486182ed4f8d | |
parent | bc0af736b98ed1b628acc6b2d2cd11b4fe3a04e8 (diff) | |
parent | 856efcd3eb3b2ac0c0742aa115054cdffb4c4bf2 (diff) | |
parent | 29d28cd500fa0fccdcfc92a96e20c18af9ccfb5c (diff) | |
download | powerdebugV2-d71cbaa0d625f5161e453a225bd8793c321908b8.tar.gz |
Merge branches 'master' and 'debian' into release