Merge git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/beceem into work-next

2026-10-16 22:39:48 +00:00 · 2010-11-09 13:43:45 -08:00 · 2010-11-09 13:43:45 -08:00 · 2ff81110de
commit 2ff81110de
parent a7bcf21e60 e5837cef1d
44 changed files with 1216 additions and 4207 deletions
--- a/drivers/staging/bcm/Adapter.h
+++ b/drivers/staging/bcm/Adapter.h
--- a/drivers/staging/bcm/Arp.c
+++ b/drivers/staging/bcm/Arp.c
--- a/drivers/staging/bcm/Bcmchar.c
+++ b/drivers/staging/bcm/Bcmchar.c
--- a/drivers/staging/bcm/Bcmnet.c
+++ b/drivers/staging/bcm/Bcmnet.c
--- a/drivers/staging/bcm/CmHost.c
+++ b/drivers/staging/bcm/CmHost.c
--- a/drivers/staging/bcm/CmHost.h
+++ b/drivers/staging/bcm/CmHost.h
--- a/drivers/staging/bcm/DDRInit.c
+++ b/drivers/staging/bcm/DDRInit.c
--- a/drivers/staging/bcm/Debug.c
+++ b/drivers/staging/bcm/Debug.c
--- a/drivers/staging/bcm/Debug.h
+++ b/drivers/staging/bcm/Debug.h
--- a/drivers/staging/bcm/HandleControlPacket.c
+++ b/drivers/staging/bcm/HandleControlPacket.c
--- a/drivers/staging/bcm/HostMibs.h
+++ b/drivers/staging/bcm/HostMibs.h
--- a/drivers/staging/bcm/IPv6Protocol.c
+++ b/drivers/staging/bcm/IPv6Protocol.c
--- a/drivers/staging/bcm/IPv6ProtocolHdr.h
+++ b/drivers/staging/bcm/IPv6ProtocolHdr.h
--- a/drivers/staging/bcm/InterfaceDld.c
+++ b/drivers/staging/bcm/InterfaceDld.c
--- a/drivers/staging/bcm/InterfaceIdleMode.c
+++ b/drivers/staging/bcm/InterfaceIdleMode.c
--- a/drivers/staging/bcm/InterfaceIdleMode.h
+++ b/drivers/staging/bcm/InterfaceIdleMode.h
--- a/drivers/staging/bcm/InterfaceInit.c
+++ b/drivers/staging/bcm/InterfaceInit.c
--- a/drivers/staging/bcm/InterfaceInit.h
+++ b/drivers/staging/bcm/InterfaceInit.h
--- a/drivers/staging/bcm/InterfaceIsr.c
+++ b/drivers/staging/bcm/InterfaceIsr.c
--- a/drivers/staging/bcm/InterfaceMisc.c
+++ b/drivers/staging/bcm/InterfaceMisc.c
--- a/drivers/staging/bcm/InterfaceMisc.h
+++ b/drivers/staging/bcm/InterfaceMisc.h
--- a/drivers/staging/bcm/InterfaceRx.c
+++ b/drivers/staging/bcm/InterfaceRx.c
--- a/drivers/staging/bcm/InterfaceTx.c
+++ b/drivers/staging/bcm/InterfaceTx.c
--- a/drivers/staging/bcm/InterfaceTx.h
+++ b/drivers/staging/bcm/InterfaceTx.h
--- a/drivers/staging/bcm/Interfacemain.h
+++ b/drivers/staging/bcm/Interfacemain.h
--- a/drivers/staging/bcm/LeakyBucket.c
+++ b/drivers/staging/bcm/LeakyBucket.c
--- a/drivers/staging/bcm/Macros.h
+++ b/drivers/staging/bcm/Macros.h
--- a/drivers/staging/bcm/Makefile
+++ b/drivers/staging/bcm/Makefile
--- a/drivers/staging/bcm/Misc.c
+++ b/drivers/staging/bcm/Misc.c
--- a/drivers/staging/bcm/Osal_Misc.c
+++ b/drivers/staging/bcm/Osal_Misc.c
--- a/drivers/staging/bcm/PHSModule.c
+++ b/drivers/staging/bcm/PHSModule.c
--- a/drivers/staging/bcm/PHSModule.h
+++ b/drivers/staging/bcm/PHSModule.h
--- a/drivers/staging/bcm/Protocol.h
+++ b/drivers/staging/bcm/Protocol.h
--- a/drivers/staging/bcm/Prototypes.h
+++ b/drivers/staging/bcm/Prototypes.h
--- a/drivers/staging/bcm/Qos.c
+++ b/drivers/staging/bcm/Qos.c
--- a/drivers/staging/bcm/TODO
+++ b/drivers/staging/bcm/TODO
--- a/drivers/staging/bcm/Transmit.c
+++ b/drivers/staging/bcm/Transmit.c
--- a/drivers/staging/bcm/cntrl_SignalingInterface.h
+++ b/drivers/staging/bcm/cntrl_SignalingInterface.h
--- a/drivers/staging/bcm/headers.h
+++ b/drivers/staging/bcm/headers.h
--- a/drivers/staging/bcm/hostmibs.c
+++ b/drivers/staging/bcm/hostmibs.c
--- a/drivers/staging/bcm/led_control.c
+++ b/drivers/staging/bcm/led_control.c
--- a/drivers/staging/bcm/nvm.c
+++ b/drivers/staging/bcm/nvm.c
--- a/drivers/staging/bcm/nvm.h
+++ b/drivers/staging/bcm/nvm.h
--- a/drivers/staging/bcm/osal_misc.h
+++ b/drivers/staging/bcm/osal_misc.h