diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-06-04 12:25:36 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-06-04 12:25:36 -0700 |
| commit | f2c6b9e4b2708ae50e3ab8c91dcad1564974f2a4 (patch) | |
| tree | 8777edeb0e3b741da4254a0d273275913b097464 /drivers/watchdog/softdog.c | |
| parent | 95b46aeb05c53726236a2a468ad16119afd42b2c (diff) | |
| parent | ce7585f3c4d76bca1dff4b66ae1ea32552954f9e (diff) | |
| download | op-kernel-dev-f2c6b9e4b2708ae50e3ab8c91dcad1564974f2a4.zip op-kernel-dev-f2c6b9e4b2708ae50e3ab8c91dcad1564974f2a4.tar.gz | |
Merge tag 'vfio-v4.7-rc2' of git://github.com/awilliam/linux-vfio
Pull VFIO fixes from Alex Williamson:
"Fix irqfd shutdown ordering, build warning, and VPD short read"
* tag 'vfio-v4.7-rc2' of git://github.com/awilliam/linux-vfio:
vfio/pci: Allow VPD short read
vfio/type1: Fix build warning
vfio/pci: Fix ordering of eventfd vs virqfd shutdown
Diffstat (limited to 'drivers/watchdog/softdog.c')
0 files changed, 0 insertions, 0 deletions
