summaryrefslogtreecommitdiff
path: root/include/net/busy_poll.h
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2017-01-30 21:22:37 -0800
committerOlof Johansson <olof@lixom.net>2017-01-30 21:22:37 -0800
commit36e854c3b8e17db0e9ace2c603d492b71d53b5cd (patch)
tree91e70d2a402741b8da89d38c36a36c2b7fb09a7e /include/net/busy_poll.h
parent0a019a28e0ca0af7dc2691d1a9527960b07ad2bb (diff)
parent420a3879d694e5c3e734fb92151d19b2ec503e46 (diff)
Merge tag 'at91-ab-4.10-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into fixes
AT91 SoC fixes for 4.10: - change email addresses for Nicolas and Ludovic following the Microchip-Atmel merger * tag 'at91-ab-4.10-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux: MAINTAINERS: change email address from atmel to microchip MAINTAINERS: at91: change email address Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'include/net/busy_poll.h')
0 files changed, 0 insertions, 0 deletions
2d140a1f4aaffd297ac487f246963dd2f'>diff)
Merge tag 'nfsd-4.10-1' of git://linux-nfs.org/~bfields/linux
Pull nfsd fixes from Bruce Fields: "Miscellaneous nfsd bugfixes, one for a 4.10 regression, three for older bugs" * tag 'nfsd-4.10-1' of git://linux-nfs.org/~bfields/linux: svcrdma: avoid duplicate dma unmapping during error recovery sunrpc: don't call sleeping functions from the notifier block callbacks svcrpc: don't leak contexts on PROC_DESTROY nfsd: fix supported attributes for acl & labels
Diffstat (limited to 'tools/arch/ia64/include/asm/barrier.h')