summaryrefslogtreecommitdiff
path: root/firmware
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2009-06-03 13:43:41 +0400
committerDavid S. Miller <davem@davemloft.net>2009-06-03 13:43:41 +0400
commitb2f8f7525c8aa1fdd8ad8c72c832dfb571d5f768 (patch)
tree71ae1801d264bca62efa0d22376b49de7f206e9a /firmware
parentd455e5b165a367a628110ec2d18807ea10052cd1 (diff)
parent12186be7d2e1106cede1cc728526e3d7998cbe94 (diff)
downloadlinux-b2f8f7525c8aa1fdd8ad8c72c832dfb571d5f768.tar.xz
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts: drivers/net/forcedeth.c
Diffstat (limited to 'firmware')
-rw-r--r--firmware/cis/.gitignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/firmware/cis/.gitignore b/firmware/cis/.gitignore
new file mode 100644
index 000000000000..1de39847f261
--- /dev/null
+++ b/firmware/cis/.gitignore
@@ -0,0 +1 @@
+*.cis