Merge commit 'e26a9e0' into stable/for-linus-3.15

This commit is contained in:
David Vrabel 2014-04-28 10:31:04 +01:00
commit 67dadcb324
69 changed files with 502 additions and 387 deletions