From: Santosh Shilimkar Date: Fri, 30 Oct 2015 16:25:07 +0000 (-0700) 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~244 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=139890ddf7c1e1982b50086c2622822ba6c3804f;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: Revert "ocfs2: change ip_unaligned_aio to of type mutex from atomit_t" ocfs2: fix a performance issue with synced buffer io --- 139890ddf7c1e1982b50086c2622822ba6c3804f