Merge branch 'nomadik' into devel

This commit is contained in:
Linus Walleij 2012-11-11 19:12:46 +01:00
commit ae1cde8c50
16 changed files with 467 additions and 329 deletions