summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-01-05 01:36:52 +0100
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-05 01:36:52 +0100
commit25c862cc9ea9b312c25a9f577f91b973131f1261 (patch)
tree8e8f56531144370ced50fa98db2973f4e93e38b0 /kernel
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial (diff)
parentMerge branch 'master' (diff)
downloadlinux-25c862cc9ea9b312c25a9f577f91b973131f1261.tar.xz
linux-25c862cc9ea9b312c25a9f577f91b973131f1261.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild
Diffstat (limited to 'kernel')
-rw-r--r--kernel/.gitignore5
1 files changed, 5 insertions, 0 deletions
diff --git a/kernel/.gitignore b/kernel/.gitignore
new file mode 100644
index 000000000000..f2ab70073bd4
--- /dev/null
+++ b/kernel/.gitignore
@@ -0,0 +1,5 @@
+#
+# Generated files
+#
+config_data.h
+config_data.gz