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

* 'topic/uek-4.1/sparc' of git://ca-git.us.oracle.com/linux-uek:
  Do not execute i40e_macaddr_init if the macaddr is default

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