summaryrefslogtreecommitdiff
path: root/mausezahn
AgeCommit message (Expand)AuthorFilesLines
2014-04-22conf: Use configuration file path from Makefile instead of hardcoded pathsTobias Klauser1-1/+0
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
)parent3b4f18843e511193e7eb616710e838f5852e661d (diff)
Merge branch 'stable/for-jens-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen into for-linus
Konrad writes: Please pull in your 'for-linus' branch two little fixes for Xen block front: One fix is for handling the XEN_PAGE_SIZE != PAGE_SIZE (4KB vs 64KB on ARM for example) mishandling while the other is fixing the accounting for the configuration changes.
Diffstat (limited to 'net/batman-adv/tp_meter.h')