diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-20 04:31:02 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-20 04:31:02 (GMT) |
| commit | f01af9f85855e38fbd601e033a8eac204cc4cc1c (patch) | |
| tree | 106b1b24dd17a0c6cb9fdda35a249f429310b025 /arch/cris | |
| parent | 9eb127cc04c4005c8c0708ce92146d91da862b42 (diff) | |
| parent | 62ba63dc892cf836ecb9ce4fdb7644d45c95070b (diff) | |
| download | linux-f01af9f85855e38fbd601e033a8eac204cc4cc1c.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
Pull sparc fixes from David Miller:
"Please pull to get these sparc AES/DES/CAMELLIA crypto bug fixes as
well as an addition of a pte_accessible() define for sparc64 and a
hugetlb fix from Dave Kleikamp."
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
sparc64: Set CRYPTO_TFM_REQ_MAY_SLEEP consistently in CAMELLIA code.
sparc64: Set CRYPTO_TFM_REQ_MAY_SLEEP consistently in DES code.
sparc64: Fix ECB looping constructs in AES code.
sparc64: Set CRYPTO_TFM_REQ_MAY_SLEEP consistently in AES code.
sparc64: Fix AES ctr mode block size.
sparc64: Fix unrolled AES 256-bit key loops.
sparc64: Define pte_accessible()
sparc: huge_ptep_set_* functions need to call set_huge_pte_at()
Diffstat (limited to 'arch/cris')
0 files changed, 0 insertions, 0 deletions