From f52c44cd27b4a0be37ef97f0466e4095ebebef3f Mon Sep 17 00:00:00 2001
From: James Morris <james.l.morris@oracle.com>
Date: Sun, 10 Jun 2012 22:48:36 +1000
Subject: [PATCH] Merge branches 'next-queue' and 'next' into next

Pull in changes submitted during upstream merge window.
-- 
2.50.1