aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Lezcano <daniel.lezcano@linaro.org>2011-09-20 16:15:22 +0200
committerDaniel Lezcano <daniel.lezcano@linaro.org>2011-09-20 16:15:22 +0200
commit027e856741fb41263505ee0681b39270f76d9a5c (patch)
treeb076d3ed4d095dd66c2d1329c3ed7a45fb43f9a8
parent4a80a40af1e669d3f7c9548425abda7f69aae797 (diff)
parenta61f3260962fd2fd82bb3faf3cd069518d00408d (diff)
parente557edb8168bc43669e882d26f43259b3ce31d81 (diff)
downloadpowerdebugV2-027e856741fb41263505ee0681b39270f76d9a5c.tar.gz
Merge branches 'master' and 'debian' into release