From: Michal Sojka <sojkam1@fel.cvut.cz>
Date: Wed, 1 Dec 2010 12:33:25 +0000 (+0100)
Subject: Merge branch 'master' of rtime.felk.cvut.cz:/can-benchmark
X-Git-Tag: fix-allnoconfig~289
X-Git-Url: http://rtime.felk.cvut.cz/gitweb/can-benchmark.git/commitdiff_plain/513a76d1726882150986a70de07e1d82a52531d3?hp=9cb2922814c090fb34c7a7166220df6c252bf5ba

Merge branch 'master' of rtime.felk.cvut.cz:/can-benchmark
---

diff --git a/kernel/2.6.33 b/kernel/2.6.33
index 4a70475..e2f49b5 160000
--- a/kernel/2.6.33
+++ b/kernel/2.6.33
@@ -1 +1 @@
-Subproject commit 4a7047510e6bc78f2623fdc47f7ff138f44f7a43
+Subproject commit e2f49b5021a59d63b41663411925e621ca86c79a
diff --git a/kernel/2.6.33-rt b/kernel/2.6.33-rt
index df1889a..92487e4 160000
--- a/kernel/2.6.33-rt
+++ b/kernel/2.6.33-rt
@@ -1 +1 @@
-Subproject commit df1889adaa1910ab8c86644cee2934ad93c5678a
+Subproject commit 92487e4f349cd7518cc3202662f42fea7d42ba73
diff --git a/kernel/build/.gitignore b/kernel/build/.gitignore
deleted file mode 100644
index e52b527..0000000
--- a/kernel/build/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-glab-2.6.33-rt
diff --git a/kernel/build/glab-2.6.33-rt/.gitignore b/kernel/build/glab-2.6.33-rt/.gitignore
new file mode 100644
index 0000000..973fa38
--- /dev/null
+++ b/kernel/build/glab-2.6.33-rt/.gitignore
@@ -0,0 +1,4 @@
+*
+!.config
+!GNUmakefile
+!.gitignore
diff --git a/kernel/build/glab-2.6.33/.gitignore b/kernel/build/glab-2.6.33/.gitignore
new file mode 100644
index 0000000..973fa38
--- /dev/null
+++ b/kernel/build/glab-2.6.33/.gitignore
@@ -0,0 +1,4 @@
+*
+!.config
+!GNUmakefile
+!.gitignore
diff --git a/kernel/build/shark/.gitignore b/kernel/build/shark/.gitignore
deleted file mode 100644
index c347c50..0000000
--- a/kernel/build/shark/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-2.6.33/
-2.6.33-rt/
diff --git a/kernel/build/shark/2.6.33-rt/.gitignore b/kernel/build/shark/2.6.33-rt/.gitignore
new file mode 100644
index 0000000..973fa38
--- /dev/null
+++ b/kernel/build/shark/2.6.33-rt/.gitignore
@@ -0,0 +1,4 @@
+*
+!.config
+!GNUmakefile
+!.gitignore
diff --git a/kernel/build/shark/2.6.33/.gitignore b/kernel/build/shark/2.6.33/.gitignore
new file mode 100644
index 0000000..973fa38
--- /dev/null
+++ b/kernel/build/shark/2.6.33/.gitignore
@@ -0,0 +1,4 @@
+*
+!.config
+!GNUmakefile
+!.gitignore