Merge branch 'sa1100' into for-next

This commit is contained in:
Russell King 2015-06-12 21:18:13 +01:00
commit c62af70ff3
7 changed files with 246 additions and 179 deletions