linux-stable

mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-12 08:00:09 +00:00

History

Greg Kroah-Hartman 0c9e98af5e 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>

2011-07-05 07:35:09 -07:00

brcmfmac

staging: remove unnecessary code

2011-06-28 13:13:42 -07:00

brcmsmac

staging: brcm80211: fix checkpatch errors in brcmsmac driver

2011-06-28 13:02:43 -07:00

brcmutil

staging: brcm80211: #include reduction

2011-06-28 13:02:37 -07:00

include

staging: brcm80211: removed superfluous forward struct declarations

2011-06-28 13:02:42 -07:00

Kconfig

Staging: brcm80211: disable drivers except for X86 or MIPS platforms

2011-06-27 14:34:42 -07:00

Makefile

staging: brcm80211: renamed utility module related files

2011-06-07 12:43:27 -07:00

README

staging: brcm80211: updated MAINTAINERS, README and TODO files

2011-06-07 12:36:46 -07:00

TODO

staging: brcm80211: updated TODO with current state of affairs

2011-06-07 12:49:33 -07:00

README

refer to: http://linuxwireless.org/en/users/Drivers/brcm80211