Merge branch 'master' into tk71

[mv-sheeva.git] / net / batman-adv / bat_sysfs.h

diff --git a/drivers/staging/batman-adv/bat_sysfs.h b/net/batman-adv/bat_sysfs.h
similarity index 100%
rename from drivers/staging/batman-adv/bat_sysfs.h
rename to net/batman-adv/bat_sysfs.h