MTD: merge 3.18 development into -next development
authorBrian Norris <computersforpeace@gmail.com>
Tue, 21 Oct 2014 20:46:59 +0000 (13:46 -0700)
committerBrian Norris <computersforpeace@gmail.com>
Tue, 21 Oct 2014 20:46:59 +0000 (13:46 -0700)
commit577267f39cc10981a36cc8d3ee274806256a6232
treeda513ef82762eec4f9a5139321368e725a7aa7ae
parentf114040e3ea6e07372334ade75d1ee0775c355e1
parenta5b7616c55e188fe3d6ef686bef402d4703ecb62
MTD: merge 3.18 development into -next development

To keep the two paths in sync