2d1995f650e92f26184afd28e6cf40bf64467a
author Greg Kroah-Hartman <gregkh@suse.de> 1281043083 -0700
committer Greg Kroah-Hartman <gregkh@suse.de> 1281043083 -0700

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>
„