summaryrefslogtreecommitdiffstats
path: root/crypto/cipher.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-10-02 14:03:04 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2015-10-02 14:03:04 +0200
commit36f8dafe52b0d0726edd5102900e37192f1d3c65 (patch)
tree275620178300956525d5f01f70f6dd5cf2ce91ee /crypto/cipher.c
parentMerge git://git.infradead.org/intel-iommu (diff)
parentmmc: core: fix dead loop of mmc_retune (diff)
downloadlinux-36f8dafe52b0d0726edd5102900e37192f1d3c65.tar.xz
linux-36f8dafe52b0d0726edd5102900e37192f1d3c65.zip
Merge tag 'mmc-v4.3-rc3' of git://git.linaro.org/people/ulf.hansson/mmc
Pull MMC fixes from Ulf Hansson: "Here are some mmc fixes intended for v4.3 rc4: MMC core: - Allow users of mmc_of_parse() to succeed when CONFIG_GPIOLIB is unset - Prevent infinite loop of re-tuning for CRC-errors for CMD19 and CMD21 MMC host: - pxamci: Fix issues with card detect - sunxi: Fix clk-delay settings" * tag 'mmc-v4.3-rc3' of git://git.linaro.org/people/ulf.hansson/mmc: mmc: core: fix dead loop of mmc_retune mmc: pxamci: fix card detect with slot-gpio API mmc: sunxi: Fix clk-delay settings mmc: core: Don't return an error for CD/WP GPIOs when GPIOLIB is unset
Diffstat (limited to 'crypto/cipher.c')
0 files changed, 0 insertions, 0 deletions