tree 531cac53b3dd2c5f10d01246af579ef114bb169c
parent e59d969f441fb8e25b30125bdf201153adc5a7e3
parent 9b472600b02f6771c04455f8a0019e2a98e0db88
author Linus Walleij <linus.walleij@linaro.org> 1352657566 +0100
committer Linus Walleij <linus.walleij@linaro.org> 1352657566 +0100

Merge branch 'nomadik' into devel