The following commit has been merged in the master branch: commit 9f6869518ebc105a53735c0cfd7ed2c241aa4417 Author: Antonio Quartulli antonio@meshcoding.com Date: Fri Oct 11 08:30:30 2013 +0200

batman-adv: update email address for Antonio Quartulli

Signed-off-by: Antonio Quartulli antonio@meshcoding.com Signed-off-by: Marek Lindner mareklindner@neomailbox.ch

diff --git a/Documentation/ABI/testing/sysfs-class-net-mesh b/Documentation/ABI/testing/sysfs-class-net-mesh index 96ae0a4..a86528c 100644 --- a/Documentation/ABI/testing/sysfs-class-net-mesh +++ b/Documentation/ABI/testing/sysfs-class-net-mesh @@ -8,7 +8,7 @@ Description:

What: /sys/class/net/<mesh_iface>/mesh/ap_isolation Date: May 2011 -Contact: Antonio Quartulli ordex@autistici.org +Contact: Antonio Quartulli antonio@meshcoding.com Description: Indicates whether the data traffic going from a wireless client to another wireless client will be