summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2006-05-02 15:49:39 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2006-05-02 15:49:39 -0300
commitaa4fe3388c9e6816f918a59218a376ac165c33f8 (patch)
tree5cdf3e0d9a6dc91a1e9fec3b7562e0390f59b8cb
parentb67050b2cbc3429dcde05d2e90ef266743f4540e (diff)
parent10e67fc2f161dcd10edd7d728d526df858cfc8ad (diff)
downloadmediapointer-dvb-s2-aa4fe3388c9e6816f918a59218a376ac165c33f8.tar.gz
mediapointer-dvb-s2-aa4fe3388c9e6816f918a59218a376ac165c33f8.tar.bz2
merge: from master
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
-rw-r--r--.cvsignore2
-rw-r--r--.hgignore4
-rw-r--r--linux/drivers/media/.cvsignore1
-rw-r--r--linux/drivers/media/dvb/.cvsignore1
-rw-r--r--linux/include/linux/.cvsignore1
-rw-r--r--v4l/.cvsignore7
6 files changed, 4 insertions, 12 deletions
diff --git a/.cvsignore b/.cvsignore
deleted file mode 100644
index a657192bd..000000000
--- a/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-patches
-.pc
diff --git a/.hgignore b/.hgignore
index e747de2e3..0c80329a1 100644
--- a/.hgignore
+++ b/.hgignore
@@ -12,3 +12,7 @@ v4l/Makefile.media
.*[.]orig
.*[~]
.myconfig
+v4l/Modules.symvers
+v4l/scripts/Kconfig
+v4l/scripts/Kconfig.kern
+
diff --git a/linux/drivers/media/.cvsignore b/linux/drivers/media/.cvsignore
deleted file mode 100644
index c095fc3ef..000000000
--- a/linux/drivers/media/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-dvb \ No newline at end of file
diff --git a/linux/drivers/media/dvb/.cvsignore b/linux/drivers/media/dvb/.cvsignore
deleted file mode 100644
index 72e8ffc0d..000000000
--- a/linux/drivers/media/dvb/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-*
diff --git a/linux/include/linux/.cvsignore b/linux/include/linux/.cvsignore
deleted file mode 100644
index c095fc3ef..000000000
--- a/linux/include/linux/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-dvb \ No newline at end of file
diff --git a/v4l/.cvsignore b/v4l/.cvsignore
deleted file mode 100644
index 88be5bcbc..000000000
--- a/v4l/.cvsignore
+++ /dev/null
@@ -1,7 +0,0 @@
-*.ko
-*.o.flags
-*.mod.c
-.*.cmd
-.version
-.snapshot
-.tmp_versions