From: Larry Finger <Larry.Finger@lwfinger.net>
Date: Tue, 26 Jul 2011 20:52:24 +0000 (-0500)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6
X-Git-Tag: v3.2-rc1~169^2^2~864^2~132^2~65
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=48d67fe03511c8ded54c39561dfedbdf7c78c743;p=pandora-kernel.git

Merge branch 'master' of git://git./linux/kernel/git/gregkh/staging-2.6

Conflicts:
	Documentation/feature-removal-schedule.txt
	drivers/staging/bcm/headers.h
	drivers/staging/brcm80211/brcmfmac/dhd_linux.c
	drivers/staging/brcm80211/brcmfmac/dhd_sdio.c
	drivers/staging/brcm80211/brcmfmac/wl_cfg80211.h
	drivers/staging/brcm80211/brcmfmac/wl_iw.c
	drivers/staging/et131x/et131x_netdev.c
	drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c
	drivers/staging/rtl8192e/r8192E.h
	drivers/staging/usbip/userspace/src/utils.h
---

48d67fe03511c8ded54c39561dfedbdf7c78c743
Reading git-diff-tree failed