Merge 3.1-rc4 into staging-next
Greg Kroah-Hartman [Mon, 29 Aug 2011 15:47:46 +0000 (08:47 -0700)]
This resolves a conflict with:
drivers/staging/brcm80211/brcmsmac/types.h

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

1  2 
drivers/staging/zcache/zcache-main.c

Simple merge