summaryrefslogtreecommitdiff
path: root/epoll2.c
AgeCommit message (Expand)AuthorFilesLines
2013-06-04xutils: eliminate xutils, move rest to epoll2Daniel Borkmann1-0/+30
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-09-20 08:32:41 +0000
ption value='3' selected='selected'>3space:mode:
authorDavid S. Miller <davem@davemloft.net>2017-02-07 16:29:30 -0500
committerDavid S. Miller <davem@davemloft.net>2017-02-07 16:29:30 -0500
commit3efa70d78f218e4c9276b0bac0545e5184c1c47b (patch)
treef4abe2f05e173023d2a262afd4aebb1e89fe6985 /net/rose/rose_out.c
parent76e0e70e6452b971a69cc9794ff4a6715c11f7f2 (diff)
parent926af6273fc683cd98cd0ce7bf0d04a02eed6742 (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
The conflict was an interaction between a bug fix in the netvsc driver in 'net' and an optimization of the RX path in 'net-next'. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/rose/rose_out.c')