diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-12-24 22:23:24 +0300 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-12-24 22:23:24 +0300 |
commit | 01e0d6037de687fd3bb8b45ab1376e8322c1fcc9 (patch) | |
tree | 6f79023e4723f9393071b81a9086a055fc1a0190 /drivers/watchdog/mei_wdt.c | |
parent | 6ac3bb167fed0b3d02b4fd3daa0d819841d5f6f4 (diff) | |
parent | dfb7d24c5ad5c986f2417f52784738b67cfedd4d (diff) | |
download | linux-01e0d6037de687fd3bb8b45ab1376e8322c1fcc9.tar.xz |
Merge tag 'ntb-4.10' of git://github.com/jonmason/ntb
Pull NTB update from Jon Mason:
- NTB bug fixes for removing an unnecessary call to ntb_peer_spad_read,
and correcting a free_irq inconsistency
- add Intel SKX support
- change the AMD NTB maintainer, and fix some bugs present there
* tag 'ntb-4.10' of git://github.com/jonmason/ntb:
ntb_transport: Remove unnecessary call to ntb_peer_spad_read
NTB: Fix 'request_irq()' and 'free_irq()' inconsistancy
ntb: fix SKX NTB config space size register offsets
NTB: correct ntb_peer_spad_read for case when callback is not supplied.
MAINTAINERS: Change in maintainer for AMD NTB
ntb_transport: Limit memory windows based on available, scratchpads
NTB: Register and offset values fix for memory window
NTB: add support for hotplug feature
ntb: Adding Skylake Xeon NTB support
Diffstat (limited to 'drivers/watchdog/mei_wdt.c')
0 files changed, 0 insertions, 0 deletions