]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
Merge branch 'topic/uek-4.1/uek-carry' of git://ca-git.us.oracle.com/linux-uek into...
authorSantosh Shilimkar <santosh.shilimkar@oracle.com>
Fri, 30 Oct 2015 16:24:52 +0000 (09:24 -0700)
committerSantosh Shilimkar <santosh.shilimkar@oracle.com>
Fri, 30 Oct 2015 16:24:52 +0000 (09:24 -0700)
* '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


Trivial merge