diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2015-11-20 15:52:52 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-11-20 15:52:52 -0800 |
| commit | 81051f9120560059ba7055e974e42bd05a67de6d (patch) | |
| tree | be004c304940689869441dc8169f9559128e1c10 /net/unix/af_unix.c | |
| parent | Merge tag '4.4-fix' of git://git.lwn.net/linux (diff) | |
| parent | i2c: i801: add Intel Lewisburg device IDs (diff) | |
| download | wireguard-linux-81051f9120560059ba7055e974e42bd05a67de6d.tar.xz wireguard-linux-81051f9120560059ba7055e974e42bd05a67de6d.zip | |
Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
Pull i2c fixes from Wolfram Sang:
"A few bugfixes and one PCI ID addition from I2C"
* 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
i2c: i801: add Intel Lewisburg device IDs
i2c: fix wakeup irq parsing
i2c: xiic: Prevent concurrent running of the IRQ handler and __xiic_start_xfer()
i2c: Revert "i2c: xiic: Do not reset controller before every transfer"
i2c: imx: fix a compiling error
Diffstat (limited to 'net/unix/af_unix.c')
0 files changed, 0 insertions, 0 deletions