From: Chuck Anderson <chuck.anderson@oracle.com>
Date: Sun, 27 Nov 2016 22:06:49 +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~29
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=5575f71a98ee397c34506afc1e66f5562cb23b8d;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:
  uek-rpm: sparc: enable mlx5 and mlx4_vnic for sparc
  uek-rpm: sparc: turn on KEXEC and CRASH_DUMP config option
---

5575f71a98ee397c34506afc1e66f5562cb23b8d