Greg Kroah-Hartman e9563355ac Staging: Merge staging-next into Linus's tree
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>
2010-08-05 14:18:03 -07:00
..
2010-07-27 11:12:21 -07:00
2010-07-27 11:06:29 -07:00
2010-04-30 09:30:10 -07:00

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>