Merge tag 'v3.18' into for_next
authorChris Zankel <chris@zankel.net>
Tue, 16 Dec 2014 04:09:06 +0000 (20:09 -0800)
committerChris Zankel <chris@zankel.net>
Tue, 16 Dec 2014 04:09:06 +0000 (20:09 -0800)
Linux 3.18


Trivial merge