summaryrefslogtreecommitdiff
path: root/mausezahn
AgeCommit message (Expand)AuthorFilesLines
2013-07-30build: reduce Extra contents to bare minimumDaniel Borkmann1-0/+2
2013-07-11build: refactor tool specific flags into <tool>/MakefileDaniel Borkmann1-0/+5
2013-06-04xutils: eliminate xutils, move rest to epoll2Daniel Borkmann1-3/+1
2013-06-04sock: add socket management functionsDaniel Borkmann1-0/+1
2013-06-04xutils: break out string handling and lockingDaniel Borkmann1-0/+1
2013-05-13staging: add mausezahn staging directoryDaniel Borkmann2-0/+70
a94219c1e46b02ae97757a'>3ec10d3a2ba591c87da94219c1e46b02ae97757a (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf
Pablo Neira Ayuso says: ==================== Netfilter/IPVS fixes for net The following patchset contains two Netfilter/IPVS fixes for your net tree, they are: 1) Fix missing alignment in next offset calculation for standard targets, introduced in the previous merge window, patch from Florian Westphal. 2) Fix to correct the handling of outgoing connections which use the SIP-pe such that the binding of a real-server is updated when needed. This was an omission from changes introduced by Marco Angaroni in the previous merge window too, to allow handling of outgoing connections by the SIP-pe. Patch and report came via Simon Horman. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat