diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-02-10 14:39:08 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-02-10 14:39:08 -0800 |
| commit | aca9fa0c8d225b1446dbed798b1d2f20e37e52cf (patch) | |
| tree | cf8d9f70ca376665da6b83eaae382ac0218395fc /drivers/usb/serial/metro-usb.c | |
| parent | fc6f41ba8b2e705f91324db158c3cc28209a15b1 (diff) | |
| parent | bbb27fc33d44e7b8d96369810654df4ee1837566 (diff) | |
Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
Pull i2c bugfixes from Wolfram Sang:
"Two bugfixes (proper IO mapping and use of mutex) for a driver feature
we introduced in this cycle"
* 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
i2c: piix4: Request the SMBUS semaphore inside the mutex
i2c: piix4: Fix request_region size
Diffstat (limited to 'drivers/usb/serial/metro-usb.c')