diff options
| author | Linus Torvalds | 2016-06-11 11:24:54 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2016-06-11 11:24:54 -0700 |
| commit | 5d1f7023fb2233d454ac3ac2fb7cc96fb94e9cac (patch) | |
| tree | c0088a7a1126b23435cb00d8cb00d89e0119b3c8 /fs/dlm | |
| parent | 90735c99edfa1968a3e8da26a0b471a59fbc0f57 (diff) | |
| parent | 9f05e6219023116b59f6495e8c4d4ba352dd5fea (diff) | |
Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
Pull i2c fixes from Wolfram Sang:
- a bigger fix for i801 to finally be able to be loaded on some
machines again
- smaller driver fixes
- documentation update because of a renamed file
* 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
i2c: mux: reg: Provide of_match_table
i2c: mux: refer to i2c-mux.txt
i2c: octeon: Avoid printk after too long SMBUS message
i2c: octeon: Missing AAK flag in case of I2C_M_RECV_LEN
i2c: i801: Allow ACPI SystemIO OpRegion to conflict with PCI BAR
Diffstat (limited to 'fs/dlm')
0 files changed, 0 insertions, 0 deletions