Merge tag 'v4.0' into for_next
authorChris Zankel <chris@zankel.net>
Tue, 14 Apr 2015 03:51:35 +0000 (03:51 +0000)
committerChris Zankel <chris@zankel.net>
Tue, 14 Apr 2015 03:51:35 +0000 (03:51 +0000)
Linux 4.0


Trivial merge