Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux...
authorDoug Ledford <dledford@redhat.com>
Thu, 28 Apr 2016 19:16:21 +0000 (15:16 -0400)
committerDoug Ledford <dledford@redhat.com>
Thu, 28 Apr 2016 19:16:21 +0000 (15:16 -0400)

Trivial merge