From: Santosh Shilimkar <santosh.shilimkar@oracle.com>
Date: Fri, 28 Aug 2015 17:56:53 +0000 (-0700)
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~289
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=1c62745ac97ad7aed701f423fd3dbde1a0a0bb99;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' of git://ca-git.us.oracle.com/linux-uek:
  uek-rpm: configs: Enable Chelsio T4 and T5 NIC on OL6
---

1c62745ac97ad7aed701f423fd3dbde1a0a0bb99