Andrew Lunn (2): Fix the naming of the debug option in Kconfig. Add Kconfig dependancies on PROC_FS and PACKET. signed-off-by: Andrew Lunn andrew@lunn.ch
marek (4): [batman-adv] replace internal logging mechanism with standard kernel logging [batctl adapt batctl to the new logging mechanisms Updating orig_str for debug [batman-adv] correctly name the configuration option for debugging
simon (4): Andrews refactored routing.c file patch: "I broke a lot of the big functions up into many smaller ones. This helps with readability and there is now a lot less code squashed against the right margin." stop permanent warnings if a device is added but deactivated. split originator handling parts off routing.c if discarding a packet, we need to read it under any condition.