From: Santosh Shilimkar <santosh.shilimkar@oracle.com>
Date: Fri, 8 Jan 2016 17:24:50 +0000 (-0800)
Subject: Merge branch 'topic/uek-4.1/ocfs2' of git://ca-git.us.oracle.com/linux-uek into uek... 
X-Git-Tag: v4.1.12-92~209
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=93aaeadffc19cf40c3f590068ecffa726b7e080c;p=users%2Fjedix%2Flinux-maple.git

Merge branch 'topic/uek-4.1/ocfs2' of git://ca-git.us.oracle.com/linux-uek into uek/uek-4.1

* 'topic/uek-4.1/ocfs2' of git://ca-git.us.oracle.com/linux-uek:
  ocfs2: return non-zero st_blocks for inline data
---

93aaeadffc19cf40c3f590068ecffa726b7e080c