diff --git a/[refs] b/[refs] index 7aaf7adbf2c7..9d102ba86fbc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d828f528beab0dfe796da2617f1726d3d33a33dc +refs/heads/master: 7809cea94f4094918df062bd84b327dc4119d304 diff --git a/trunk/drivers/staging/batman-adv/sysfs-class-net-mesh b/trunk/drivers/staging/batman-adv/sysfs-class-net-mesh index c75a87b270e9..5aa1912e4553 100644 --- a/trunk/drivers/staging/batman-adv/sysfs-class-net-mesh +++ b/trunk/drivers/staging/batman-adv/sysfs-class-net-mesh @@ -6,6 +6,14 @@ Description: Indicates whether the batman protocol messages of the mesh shall be aggregated or not. +What: /sys/class/net//mesh/bonding +Date: June 2010 +Contact: Simon Wunderlich +Description: + Indicates whether the data traffic going through the + mesh will be sent using multiple interfaces at the + same time (if available). + What: /sys/class/net//mesh/orig_interval Date: May 2010 Contact: Marek Lindner