diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-10-23 10:22:33 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-10-23 10:22:33 +0100 |
| commit | 72f86d080560d77069dd67b067a69578731320e4 (patch) | |
| tree | cb3c15bbbc951e2c1be2d1facbf41fb0dc3e6178 /arch/x86 | |
| parent | c403993a41d50db1e7d9bc2d43c3c8498162312f (diff) | |
| parent | 95691e3eddc41da2d1cd3cca51fecdfb46bd85bc (diff) | |
| download | linux-72f86d080560d77069dd67b067a69578731320e4.tar.bz2 | |
Merge branch 'pcmcia-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux
Pull pcmcia fixes from Dominik Brodowski:
"These are just a few odd fixes and improvements to the PCMCIA core and
to a few PCMCIA device drivers"
* 'pcmcia-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux:
pcmcia: Implement CLKRUN protocol disabling for Ricoh bridges
pcmcia: pcmcia_resource: Replace mdelay() with msleep()
pcmcia: add error handling for pcmcia_enable_device in qlogic_stub
char: pcmcia: cm4000_cs: Replace mdelay with usleep_range in set_protocol
pcmcia: Use module_pcmcia_driver for scsi drivers
pcmcia: remove KERN_INFO level from debug message
Diffstat (limited to 'arch/x86')
0 files changed, 0 insertions, 0 deletions