diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-04-01 11:13:31 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-04-01 11:13:31 -0700 |
| commit | 1300dc689f66e7fafcbc28e88c0c839161a3507d (patch) | |
| tree | 53a0c23db02bdaa7cf5948c4601debea836e9af5 /drivers/scsi/jazz_esp.c | |
| parent | dcbcb49155be1934d13887e50b9b728e153b15c3 (diff) | |
| parent | 0bf9e1270b56b2376ba3b16d951cd0ed7c573f54 (diff) | |
Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
Pull i2c fixes from Wolfram Sang:
"Two bugfixes from I2C, specifically the I2C mux section. Thanks to
peda for collecting them"
* 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
i2c: mux: pca954x: Add missing pca9546 definition to chip_desc
Revert "i2c: mux: pca954x: Add ACPI support for pca954x"
Diffstat (limited to 'drivers/scsi/jazz_esp.c')
0 files changed, 0 insertions, 0 deletions