Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / Documentation / ABI / testing / sysfs-class-net-batman-adv

diff --git a/drivers/staging/batman-adv/sysfs-class-net-batman-adv b/Documentation/ABI/testing/sysfs-class-net-batman-adv
similarity index 100%
rename from drivers/staging/batman-adv/sysfs-class-net-batman-adv
rename to Documentation/ABI/testing/sysfs-class-net-batman-adv