From: Chuck Anderson <chuck.anderson@oracle.com>
Date: Wed, 18 Jan 2017 23:02:38 +0000 (-0800)
Subject: Merge branch topic/uek-4.1/rpm-build of git://ca-git.us.oracle.com/linux-uek into... 
X-Git-Tag: v4.1.12-92~23
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=984a8f614d3711fb80ba717408056e41eb371749;p=users%2Fjedix%2Flinux-maple.git

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

* topic/uek-4.1/rpm-build:
  Enable config options for IEEE 802.1AE driver
---

984a8f614d3711fb80ba717408056e41eb371749