From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Thu, 5 Aug 2010 21:18:03 +0000 (-0700)
Subject: Staging: Merge staging-next into Linus's tree
X-Git-Tag: v2.6.36-rc1~520^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e9563355ac1175dd3440dc2ea5c28b27ed51a283;p=pandora-kernel.git

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

e9563355ac1175dd3440dc2ea5c28b27ed51a283
Reading git-diff-tree failed