summaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authorRobert Richter <robert.richter@amd.com>2010-04-23 14:30:22 +0200
committerRobert Richter <robert.richter@amd.com>2010-04-23 14:30:22 +0200
commita36bf32e9e8a86f291f746b7f8292e042ee04a46 (patch)
treec5c999baa4c214218e3adea9b336cbd9f23950ad /.gitignore
parentbc078e4eab65f11bbaeed380593ab8151b30d703 (diff)
parent01bf0b64579ead8a82e7cfc32ae44bc667e7ad0f (diff)
downloadtalos-obmc-linux-a36bf32e9e8a86f291f746b7f8292e042ee04a46.tar.gz
talos-obmc-linux-a36bf32e9e8a86f291f746b7f8292e042ee04a46.zip
Merge commit 'v2.6.34-rc5' into oprofile/core
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore19
1 files changed, 12 insertions, 7 deletions
diff --git a/.gitignore b/.gitignore
index de6344e15706..a2939fc10b22 100644
--- a/.gitignore
+++ b/.gitignore
@@ -34,13 +34,18 @@ modules.builtin
#
# Top-level generic files
#
-tags
-TAGS
-vmlinux
-vmlinuz
-System.map
-Module.markers
-Module.symvers
+/tags
+/TAGS
+/linux
+/vmlinux
+/vmlinuz
+/System.map
+/Module.markers
+/Module.symvers
+
+#
+# git files that we don't want to ignore even it they are dot-files
+#
!.gitignore
!.mailmap
OpenPOWER on IntegriCloud