Conflicts: drivers/staging/Kconfig drivers/staging/batman-adv/bat_sysfs.c drivers/staging/batman-adv/device.c drivers/staging/batman-adv/hard-interface.c drivers/staging/cx25821/cx25821-audups11.c Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
TODO: - more discussion about the protocol - testing - review of the userspace interface Please send patches for this code to Greg Kroah-Hartman <greg@kroah.com>