diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2016-01-31 14:29:52 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-01-31 14:29:52 -0800 |
| commit | bb4768004b0a68a01fc1bc68f8f5f0f75ea584bb (patch) | |
| tree | f0d52e4b47a589d77c91f1fa31bdd9f2d23dc055 /drivers/vfio/vfio.c | |
| parent | Merge branch 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm (diff) | |
| parent | i2c: piix4: don't regress on bus names (diff) | |
| download | linux-dev-bb4768004b0a68a01fc1bc68f8f5f0f75ea584bb.tar.xz linux-dev-bb4768004b0a68a01fc1bc68f8f5f0f75ea584bb.zip | |
Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
Pull i2c fixes from Wolfram Sang:
"Here are two I2C driver regression fixes. piix4 gets a larger
overhaul fixing the latest refactoring and also an older known issue
as well. designware-pci gets a fix for a bad merge conflict
resolution"
* 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
i2c: piix4: don't regress on bus names
i2c: designware-pci: use IRQF_COND_SUSPEND flag
i2c: piix4: Fully initialize SB800 before it is registered
i2c: piix4: Fix SB800 locking
Diffstat (limited to 'drivers/vfio/vfio.c')
0 files changed, 0 insertions, 0 deletions