From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Mon, 29 Aug 2011 15:47:46 +0000 (-0700)
Subject: Merge 3.1-rc4 into staging-next
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=6eafa4604cfa109a89524d35d93df11c37bd66b0;p=deliverable%2Flinux.git

Merge 3.1-rc4 into staging-next

This resolves a conflict with:
	drivers/staging/brcm80211/brcmsmac/types.h

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

6eafa4604cfa109a89524d35d93df11c37bd66b0