From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Wed, 2 Feb 2011 21:35:58 +0000 (-0800)
Subject: Staging: Merge branch 'staging-next' into 2.6.38-rc3
X-Git-Tag: v2.6.39-rc1~469^2~734
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=949c3676cd6b2717c2abda5d9b10e6d6d7daf741;p=pandora-kernel.git

Staging: Merge branch 'staging-next' into 2.6.38-rc3

This was done to resolve conflicts in the following files due
to patches in Linus's tree and in the staging-next tree:
	drivers/staging/brcm80211/brcmsmac/wl_mac80211.c
	drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

949c3676cd6b2717c2abda5d9b10e6d6d7daf741
Reading git-diff-tree failed