From: Chuck Anderson <chuck.anderson@oracle.com>
Date: Tue, 25 Apr 2017 21:55:47 +0000 (-0700)
Subject: Merge branch 'topic/uek-4.1/drivers' of git://ca-git.us.oracle.com/linux-uek into... 
X-Git-Tag: v4.1.12-98.0.20170517_2143~36
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=0327662750bb9737cd9c99e0a799b82ad58c0488;p=users%2Fjedix%2Flinux-maple.git

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

* topic/uek-4.1/drivers:
  Revert "i40e: enable VSI broadcast promiscuous mode instead of adding broadcast filter"
---

0327662750bb9737cd9c99e0a799b82ad58c0488