From: James Morris <james.l.morris@oracle.com>
Date: Wed, 16 Jul 2014 16:10:27 +0000 (+1000)
Subject: Sync with the changes pushed by Serge in the last merge window.
X-Git-Tag: v3.17-rc1~108^2~23
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=bd89bb78f35fd175db7a9cfc504d789b6ca0f7b0;p=linux.git

Sync with the changes pushed by Serge in the last merge window.
---

bd89bb78f35fd175db7a9cfc504d789b6ca0f7b0