Merge tag 'v3.18-rc4' into for_next
authorChris Zankel <chris@zankel.net>
Mon, 10 Nov 2014 08:05:43 +0000 (00:05 -0800)
committerChris Zankel <chris@zankel.net>
Mon, 10 Nov 2014 08:05:43 +0000 (00:05 -0800)
Linux 3.18-rc4


Trivial merge