summaryrefslogtreecommitdiff
path: root/tstamping.c
AgeCommit message (Expand)AuthorFilesLines
2013-07-09configure: fix multiple issues in build configurationDaniel Borkmann1-8/+0
2013-06-04tstamping: add header file for packet timestampingDaniel Borkmann1-9/+2
2013-06-04xutils: eliminate xutils, move rest to epoll2Daniel Borkmann1-1/+0
2013-06-04xutils: break out string handling and lockingDaniel Borkmann1-0/+1
2013-05-13ring: break out timestamping since not directly relatedDaniel Borkmann1-0/+53
ux/net-next.git/tree/?id=3efa70d78f218e4c9276b0bac0545e5184c1c47b'>f4abe2f05e173023d2a262afd4aebb1e89fe6985 /include/acpi/acrestyp.h 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 'include/acpi/acrestyp.h')