From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Tue, 5 Jul 2011 14:35:09 +0000 (-0700)
Subject: Merge Linux 3.0-rc6 into staging-next
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=0c9e98af5e94877ad3b1af2c0f39b2376a462ded;p=openwrt%2Fstaging%2Fblogic.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 <gregkh@suse.de>
---

0c9e98af5e94877ad3b1af2c0f39b2376a462ded