From: Santosh Shilimkar <santosh.shilimkar@oracle.com>
Date: Fri, 30 Oct 2015 16:24:52 +0000 (-0700)
Subject: Merge branch 'topic/uek-4.1/uek-carry' of git://ca-git.us.oracle.com/linux-uek into... 
X-Git-Tag: v4.1.12-92~246
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=08857bf53b2181e7174a3baa2939b55b422475a7;p=users%2Fjedix%2Flinux-maple.git

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

* 'topic/uek-4.1/uek-carry' of git://ca-git.us.oracle.com/linux-uek:
  crypto: testmgr - Disable fips-allowed for authenc() and des() ciphers
---

08857bf53b2181e7174a3baa2939b55b422475a7