diff options
| author | David S. Miller <davem@davemloft.net> | 2015-05-31 01:07:06 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-05-31 01:07:06 -0700 |
| commit | a9ab2184f451ec78af245ebb8b663d8700d44672 (patch) | |
| tree | 2d7c40031306c541dc28b798bdc3aaea8f90c48f /net/batman-adv/translation-table.c | |
| parent | abf2e7d6e2e315b32ee00067a69aaad2cf4e1b3f (diff) | |
| parent | 8ea64e27080eb66dc26f64f28485c0bc9fc06b36 (diff) | |
| download | linux-a9ab2184f451ec78af245ebb8b663d8700d44672.tar.bz2 | |
Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge
Antonio Quartulli says:
====================
Included changes:
- checkpatch fixes
- code cleanup
- debugfs component is now compiled only if DEBUG_FS is selected
- update copyright years
- disable by default not-so-user-safe features
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/batman-adv/translation-table.c')
| -rw-r--r-- | net/batman-adv/translation-table.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c index 07b263a437d1..b098e53edded 100644 --- a/net/batman-adv/translation-table.c +++ b/net/batman-adv/translation-table.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2007-2014 B.A.T.M.A.N. contributors: +/* Copyright (C) 2007-2015 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich, Antonio Quartulli * |