Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0695512a authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge

parents 5bd49735 7c64fd98

net/batman-adv/Makefile

+1 −1
Original line number Diff line number Diff line 
#

# Copyright (C) 2007-2011 B.A.T.M.A.N. contributors:

# Copyright (C) 2007-2012 B.A.T.M.A.N. contributors:

#

# Marek Lindner, Simon Wunderlich

#

net/batman-adv/bat_algo.h

+1 −1
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2011 B.A.T.M.A.N. contributors:

 * Copyright (C) 2011-2012 B.A.T.M.A.N. contributors:

 *

 * Marek Lindner

 *

net/batman-adv/bat_debugfs.c

+1 −1
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2010-2011 B.A.T.M.A.N. contributors:

 * Copyright (C) 2010-2012 B.A.T.M.A.N. contributors:

 *

 * Marek Lindner

 *

net/batman-adv/bat_debugfs.h

+1 −1
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2010-2011 B.A.T.M.A.N. contributors:

 * Copyright (C) 2010-2012 B.A.T.M.A.N. contributors:

 *

 * Marek Lindner

 *

net/batman-adv/bat_iv_ogm.c

+1 −1
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2007-2011 B.A.T.M.A.N. contributors:

 * Copyright (C) 2007-2012 B.A.T.M.A.N. contributors:

 *

 * Marek Lindner, Simon Wunderlich

 *