Merge branch 'devel-stable' into for-linus

This commit is contained in:
Russell King 2016-01-12 13:41:03 +00:00
commit 6660800fb7
29 changed files with 986 additions and 368 deletions