From: Chuck Anderson <chuck.anderson@oracle.com>
Date: Fri, 5 Feb 2016 04:17:25 +0000 (-0800)
Subject: Merge branch 'topic/uek-4.1/drivers' of git://ca-git.us.oracle.com/linux-chander... 
X-Git-Tag: v4.1.12-92~202
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=0991be8a0cd4610dbfd07faf09e8452744b70ee0;p=users%2Fjedix%2Flinux-maple.git

Merge branch 'topic/uek-4.1/drivers' of git://ca-git.us.oracle.com/linux-chander-public.git into uek/uek-4.1

* topic/uek-4.1/drivers:
  net/mlx4_core: Fix FMR unmapping to allow remapping afterward
---

0991be8a0cd4610dbfd07faf09e8452744b70ee0