The following commit has been merged in the master branch: commit b7473a38b6de6b5eda0ddbb08220f68064b47e06 Author: Simon Wunderlich siwu@hrz.tu-chemnitz.de Date: Fri May 7 21:47:11 2010 +0200

Staging: batman-adv: remove the beta from main.h for release

Signed-off-by: Simon Wunderlich siwu@hrz.tu-chemnitz.de Signed-off-by: Andrew Lunn andrew@lunn.ch Signed-off-by: Greg Kroah-Hartman gregkh@suse.de

diff --git a/drivers/staging/batman-adv/main.h b/drivers/staging/batman-adv/main.h index c943e89..5fdf5af 100644 --- a/drivers/staging/batman-adv/main.h +++ b/drivers/staging/batman-adv/main.h @@ -26,7 +26,7 @@ #define DRIVER_DESC "B.A.T.M.A.N. advanced" #define DRIVER_DEVICE "batman-adv"

-#define SOURCE_VERSION "0.2.1-beta" +#define SOURCE_VERSION "0.2.1"

/* B.A.T.M.A.N. parameters */