From: Greg Kroah-Hartman Date: Tue, 5 Jul 2011 14:35:09 +0000 (-0700) Subject: Merge Linux 3.0-rc6 into staging-next X-Git-Tag: firefly_0821_release~3680^2~4924^2~428 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=0c9e98af5e94877ad3b1af2c0f39b2376a462ded;p=firefly-linux-kernel-4.4.55.git Merge Linux 3.0-rc6 into staging-next This handles the merge conflicts with the drivers/staging/brcm80211/Kconfig file due to changes on the two different branches. Signed-off-by: Greg Kroah-Hartman --- 0c9e98af5e94877ad3b1af2c0f39b2376a462ded