From: Santosh Shilimkar <santosh.shilimkar@oracle.com>
Date: Mon, 7 Dec 2015 19:17:50 +0000 (-0800)
Subject: Merge branch 'topic/uek-4.1/sparc' of git://ca-git.us.oracle.com/linux-uek into uek... 
X-Git-Tag: v4.1.12-92~223
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=947f137eade882600869287874233dbf678063d4;p=users%2Fjedix%2Flinux-maple.git

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

* '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
---

947f137eade882600869287874233dbf678063d4