summaryrefslogtreecommitdiff
path: root/staging/mops_ext_arp.c
AgeCommit message (Collapse)AuthorFilesLines
2013-05-13staging: add mausezahn staging directoryDaniel Borkmann1-0/+239
After some back and forth, we decided that it is easier to maintain mausezahn in a staging directory until it is fully reworked and cleaned up to be ready to be fully integrated. This way, it is better than having it in a separate branch, and we can also accept patches from outside more easily. Also, while at it, fix up some function mismatches with libcli. Signed-off-by: Daniel Borkmann <dborkman@redhat.com> Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
ux/net-next.git/commit/Documentation/scheduler?id=b7e9c223be8ce335e30f2cf6ba588e6a4092275c'>b7e9c223be8ce335e30f2cf6ba588e6a4092275c (patch) tree2d1e3b75606abc18df7ad65e51ac3f90cd68b38d /Documentation/scheduler parentc172d82500a6cf3c32d1e650722a1055d72ce858 (diff)parente3bbfa78bab125f58b831b5f7f45b5a305091d72 (diff)
Merge branch 'master' into for-next
Sync with Linus' tree to be able to apply pending patches that are based on newer code already present upstream.
Diffstat (limited to 'Documentation/scheduler')