summaryrefslogtreecommitdiffstats
path: root/net/batman-adv/gateway_common.h
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2011-03-17 08:44:08 +0100
committerPaul Mundt <lethal@linux-sh.org>2011-03-17 08:44:08 +0100
commit1d2a1959fe534279cf37aba20b08c24c20840e52 (patch)
tree67c0b9aa7fe22a44bf0b4af88947799203eb8f67 /net/batman-adv/gateway_common.h
parentsh: update sh7757lcr_defconfig (diff)
parentMerge branch 'mnt_devname' of git://git.kernel.org/pub/scm/linux/kernel/git/v... (diff)
downloadlinux-1d2a1959fe534279cf37aba20b08c24c20840e52.tar.xz
linux-1d2a1959fe534279cf37aba20b08c24c20840e52.zip
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into sh-latest
Diffstat (limited to 'net/batman-adv/gateway_common.h')
-rw-r--r--net/batman-adv/gateway_common.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/batman-adv/gateway_common.h b/net/batman-adv/gateway_common.h
index 5e728d0b7959..55e527a489fe 100644
--- a/net/batman-adv/gateway_common.h
+++ b/net/batman-adv/gateway_common.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2009-2010 B.A.T.M.A.N. contributors:
+ * Copyright (C) 2009-2011 B.A.T.M.A.N. contributors:
*
* Marek Lindner
*