]> 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: 29c7160 6e72649)
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, 30 Oct 2015 16:25:07 +0000 (09:25 -0700)
committerSantosh Shilimkar <santosh.shilimkar@oracle.com>
Fri, 30 Oct 2015 16:25:07 +0000 (09:25 -0700)
* 'topic/uek-4.1/ocfs2' of git://ca-git.us.oracle.com/linux-uek:
  Revert "ocfs2: change ip_unaligned_aio to of type mutex from atomit_t"
  ocfs2: fix a performance issue with synced buffer io

1  2 
fs/ocfs2/aops.c patch | diff1 | diff2 | blob | history
fs/ocfs2/super.c patch | diff1 | diff2 | blob | history

diff --cc fs/ocfs2/aops.c
Simple merge
diff --cc fs/ocfs2/super.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.