From: Santosh Shilimkar <santosh.shilimkar@oracle.com>
Date: Fri, 25 Sep 2015 16:48: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~273
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=45a7318b01c0a5cdc0cf8ce64dd2a6514b0e5871;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 commit ff8fb335221e2c446b0d4cbea26be371fd2feb64
---

45a7318b01c0a5cdc0cf8ce64dd2a6514b0e5871