]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
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, 25 Sep 2015 16:48:07 +0000 (09:48 -0700)
committerSantosh Shilimkar <santosh.shilimkar@oracle.com>
Fri, 25 Sep 2015 16:48:07 +0000 (09:48 -0700)
* 'topic/uek-4.1/ocfs2' of git://ca-git.us.oracle.com/linux-uek:
  revert commit ff8fb335221e2c446b0d4cbea26be371fd2feb64


Trivial merge