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

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

diff --cc drivers/net/ethernet/intel/i40e/i40e_main.c
Simple merge