diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-09-19 22:24:37 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-09-19 22:24:37 +0200 |
| commit | c8d1a46f943877c08d1154a6f90f43a245a671cf (patch) | |
| tree | 3f54abbe5e15c78af96f0a3a8ba3de7c91961f04 /block/blk-cgroup.c | |
| parent | Merge tag 's390-5.9-6' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/... (diff) | |
| parent | i2c: mxs: use MXS_DMA_CTRL_WAIT4END instead of DMA_CTRL_ACK (diff) | |
| download | linux-c8d1a46f943877c08d1154a6f90f43a245a671cf.tar.xz linux-c8d1a46f943877c08d1154a6f90f43a245a671cf.zip | |
Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
Pull i2c fixes from Wolfram Sang:
"Another bunch of fixes for I2C.
Jean's i801 patch is a cleanup on top of Volker's i801 patch, but it
will make dependency handling much easier if those two go together"
* 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
i2c: mxs: use MXS_DMA_CTRL_WAIT4END instead of DMA_CTRL_ACK
i2c: mediatek: Send i2c master code at more than 1MHz
i2c: mediatek: Fix generic definitions for bus frequency
i2c: core: Call i2c_acpi_install_space_handler() before i2c_acpi_register_devices()
i2c: i801: Simplify the suspend callback
i2c: i801: Fix resume bug
i2c: aspeed: Mask IRQ status to relevant bits
Diffstat (limited to 'block/blk-cgroup.c')
0 files changed, 0 insertions, 0 deletions