summaryrefslogtreecommitdiff
path: root/timer.h
diff options
context:
space:
mode:
authorTobias Klauser <tklauser@distanz.ch>2017-05-23 09:08:19 +0200
committerTobias Klauser <tklauser@distanz.ch>2017-05-23 09:09:27 +0200
commit90b9483c806f0571988581c1712c7ca236c4a38c (patch)
tree9ebbb64a7b99ab90366db026d3fa2b77fccc8d1e /timer.h
parent95f6019a20600758ac7a42f7b0dc1526131c4574 (diff)
AUTHORS: add Baruch Siach
Add Baruch for commits 4de312bce77d ("flowtop: take PKG_CONFIG into account for libnetfilter_conntrack") and 95f6019a2060 ("proc.h: add missing headers"). Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
Diffstat (limited to 'timer.h')
0 files changed, 0 insertions, 0 deletions
linux/net-next.git/commit/tools/arch/arm/include/uapi/asm?id=3b4f18843e511193e7eb616710e838f5852e661d'>3b4f18843e511193e7eb616710e838f5852e661d (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 'tools/arch/arm/include/uapi/asm')