From: Sven Eckelmann <[email protected]> Date: Thu, 16 Dec 2010 23:28:17 +0100
> batman-adv is now moved to net/batman-adv/ and can be removed from > staging. > > Signed-off-by: Sven Eckelmann <[email protected]> > Cc: David S. Miller <[email protected]> As discussed in a previous email, please submit this to Greg KH for the staging tree, not to me for net-next-2.6. Otherwise there will be all kinds of unnecessary merge conflicts.
