Merge tag 'v4.1-rc4' into MTD's -next
authorBrian Norris <computersforpeace@gmail.com>
Mon, 18 May 2015 17:50:43 +0000 (10:50 -0700)
committerBrian Norris <computersforpeace@gmail.com>
Mon, 18 May 2015 17:50:43 +0000 (10:50 -0700)

Trivial merge