Merge branch 'nomadik' into devel
authorLinus Walleij <linus.walleij@linaro.org>
Sun, 11 Nov 2012 18:12:46 +0000 (19:12 +0100)
committerLinus Walleij <linus.walleij@linaro.org>
Sun, 11 Nov 2012 18:12:46 +0000 (19:12 +0100)
commitae1cde8c50d0c6afa073eba03b802bbeee861cf9
tree531cac53b3dd2c5f10d01246af579ef114bb169c
parente59d969f441fb8e25b30125bdf201153adc5a7e3
parent9b472600b02f6771c04455f8a0019e2a98e0db88
Merge branch 'nomadik' into devel