---

yaml --- r: 266134 b: refs/heads/master c: b9dacc5 h: refs/heads/master v: v3
git-mirror · Sep 8, 2011 · 0d7f05a · 0d7f05a
1 parent 043b2f2
commit 0d7f05a
Show file tree

Hide file tree

Showing 9 changed files with 523 additions and 600 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d0b9fd89c2e44693e4c696bc1454fbe623d2e261
+refs/heads/master: b9dacc521f1cc21f018b27c9f83668258aaec8a2
diff --git a/trunk/net/batman-adv/Makefile b/trunk/net/batman-adv/Makefile
@@ -19,7 +19,6 @@
 #
 
 obj-$(CONFIG_BATMAN_ADV) += batman-adv.o
-batman-adv-y += aggregation.o
 batman-adv-y += bat_debugfs.o
 batman-adv-y += bat_iv_ogm.o
 batman-adv-y += bat_sysfs.o

diff --git a/trunk/net/batman-adv/aggregation.c b/trunk/net/batman-adv/aggregation.c
diff --git a/trunk/net/batman-adv/aggregation.h b/trunk/net/batman-adv/aggregation.h