From: Santosh Shilimkar <santosh.shilimkar@oracle.com>
Date: Thu, 22 Oct 2015 20:55:25 +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~250
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=45d948bb184e5e29011c27a6b4f5bb9370bd8eee;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: sparc64: enable rds module
  uek-rpm: configs: sparc64: enable dtrace support
---

45d948bb184e5e29011c27a6b4f5bb9370bd8eee