]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
projects / users / jedix / linux-maple.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1bb4624 62d95e3)
Merge branch 'topic/uek-4.1/ocfs2' of git://ca-git.us.oracle.com/linux-uek into uek...
authorSantosh Shilimkar <santosh.shilimkar@oracle.com>
Fri, 8 Jan 2016 17:24:50 +0000 (09:24 -0800)
committerSantosh Shilimkar <santosh.shilimkar@oracle.com>
Fri, 8 Jan 2016 17:24:50 +0000 (09:24 -0800)
* 'topic/uek-4.1/ocfs2' of git://ca-git.us.oracle.com/linux-uek:
  ocfs2: return non-zero st_blocks for inline data


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.