diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-10-02 08:03:04 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-10-02 08:03:04 -0400 |
| commit | 36f8dafe52b0d0726edd5102900e37192f1d3c65 (patch) | |
| tree | 275620178300956525d5f01f70f6dd5cf2ce91ee /net/nfc | |
| parent | 8c25ab8b5a04a7c559aa8fd4cabe5fc4463b8ada (diff) | |
| parent | 031277d4d33d33f0174fbb569ca8f68238175617 (diff) | |
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 'net/nfc')
0 files changed, 0 insertions, 0 deletions