aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm64/kernel/vdso/.gitignore
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2017-04-06 07:25:07 -0700
committerDavid S. Miller <davem@davemloft.net>2017-04-06 08:24:51 -0700
commit6f14f443d3e773439fb9cc6f2685ba90d5d026c5 (patch)
treed45c11bba3458a805c4ac766ac85ebcf3c00b1eb /arch/arm64/kernel/vdso/.gitignore
parentbonding: attempt to better support longer hw addresses (diff)
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff)
downloadlinux-dev-6f14f443d3e773439fb9cc6f2685ba90d5d026c5.tar.xz
linux-dev-6f14f443d3e773439fb9cc6f2685ba90d5d026c5.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Mostly simple cases of overlapping changes (adding code nearby, a function whose name changes, for example). Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/arm64/kernel/vdso/.gitignore')
-rw-r--r--arch/arm64/kernel/vdso/.gitignore1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm64/kernel/vdso/.gitignore b/arch/arm64/kernel/vdso/.gitignore
index b8cc94e9698b..f8b69d84238e 100644
--- a/arch/arm64/kernel/vdso/.gitignore
+++ b/arch/arm64/kernel/vdso/.gitignore
@@ -1,2 +1 @@
vdso.lds
-vdso-offsets.h