Merge branch 'fixes-v3.15-rc1'; commit '390403fd79821bbd0c3a0d83307df2be87047b36...
authorTony Lindgren <tony@atomide.com>
Fri, 18 Apr 2014 23:44:38 +0000 (16:44 -0700)
committerTony Lindgren <tony@atomide.com>
Fri, 18 Apr 2014 23:44:38 +0000 (16:44 -0700)

Trivial merge