From: Santosh Shilimkar <santosh.shilimkar@oracle.com>
Date: Wed, 26 Aug 2015 19:10:26 +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~294
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=d20abe6b8eaebe2718ea3b2fe81dd6145e23bac7;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: sync up config with v4.1.6 stable tag
  uek-rpm: build: Update the base release to 6 with stable v4.1.6
  uek-rpm: configs: enable SNIC driver in kernel configs
---

d20abe6b8eaebe2718ea3b2fe81dd6145e23bac7