# Editor crap (emacs, vim, ...)
*.swp
*.orig
\#*\#
.\#*
.*.sw[a-z]
*.un~
# Hidden files, general things
.*
*~
# Compiled object files
*.slo
*.lo
*.o
# Compiled dynamic libraries
*.so
# Compiled static libraries
*.lai
*.la
*.a
# Compiled executables
astraceroute/astraceroute
bpfc/bpfc
curvetun/curvetun
curvetun/abiname
flowtop/flowtop
ifpps/ifpps
mausezahn/mausezahn
netsniff-ng/netsniff-ng
trafgen/trafgen
# cscope/ctags index files
cscope*
tags
# Testing folders
fuzzing/
# Ignore if someone adapts Makefile
Makefile
# Ignore build config generated by configure
Config
config.h
config.log
# Other documentation ignores
*.md
*.ps
# Compressed archives
*.tar.bz2
*.tar.bz
*.tar.xz
# Release related stuff
.MAIL_MSG
# Excluded from ignorance
!.gitignore
!.travis.yml
'/cgit.cgi/'>index : net-next.git
Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull timer fix from Ingo Molnar:
"Fix a crash in the ARM-Exynos clocksource driver, triggered by CPU
hotplug operations"
* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
clocksource/exynos_mct: Clear interrupt when cpu is shut down