leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity
65e5d002b5
linux/drivers/staging/bcm
History
Linus Torvalds 949f6711b8 Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 
* 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: (510 commits)
  staging: speakup: fix failure handling
  staging: usbip: remove double giveback of URB
  Staging: batman-adv: Remove batman-adv from staging
  Staging: hv: Use only one txf buffer per channel and kmalloc/GFP_KERNEL on initialize
  staging: hv: remove unneeded osd_schedule_callback
  staging: hv: convert channel_mgmt.c to not call osd_schedule_callback
  staging: hv: convert vmbus_on_msg_dpc to not call osd_schedule_callback
  staging: brcm80211: Fix WL_<type> logging macros
  Staging: IIO: DDS: AD9833 / AD9834 driver
  Staging: IIO: dds.h convenience macros
  Staging: IIO: Direct digital synthesis abi documentation
  staging: brcm80211: Convert ETHER_TYPE_802_1X to ETH_P_PAE
  staging: brcm80211: Remove unused ETHER_TYPE_<foo> #defines
  staging: brcm80211: Remove ETHER_HDR_LEN, use ETH_HLEN
  staging: brcm80211: Convert ETHER_ADDR_LEN to ETH_ALEN
  staging: brcm80211: Convert ETHER_IS<FOO> to is_<foo>_ether_addr
  staging: brcm80211: Remove unused ether_<foo> #defines and struct
  staging: brcm80211: Convert ETHER_IS_MULTI to is_multicast_ether_addr
  staging: brcm80211: Remove unused #defines ETHER_<foo>_LOCALADDR
  Staging: comedi: Fix checkpatch.pl issues in file s526.c
  ...

Fix up trivial conflict in drivers/video/udlfb.c
2011-01-10 16:04:53 -08:00
..
Adapter.h Staging: beceem: Use 32-bit integers for hardware register values 2010-11-10 16:28:30 -08:00
Bcmchar.c Staging: Merge 2.6.37-rc2 into staging-next 2010-11-16 10:44:50 -08:00
Bcmnet.c beceem: change startup messages 2010-11-01 14:06:24 -04:00
CmHost.c Staging: bcm: signedness bug in StoreSFParam() 2010-11-16 12:31:50 -08:00
CmHost.h beceem: make local functions static 2010-11-01 12:37:05 -04:00
cntrl_SignalingInterface.h beceem: eliminate dead code 2010-10-29 20:44:57 -07:00
DDRInit.c Staging: beceem: Use 32-bit integers for hardware register values 2010-11-10 16:28:30 -08:00
DDRInit.h
Debug.h beceem: use kernel print_hex_dump function 2010-11-01 09:30:59 -04:00
HandleControlPacket.c beceem: dump control packet information 2010-11-01 14:10:41 -04:00
headers.h Staging: Beceem: remove old kernel compatibility code 2010-12-06 16:09:45 -08:00
hostmibs.c beceem: statistics and transmit queue changes 2010-11-01 13:53:30 -04:00
HostMIBSInterface.h
InterfaceAdapter.h
InterfaceDld.c Staging, bcm: Remove unnecessary casts of void ptr returning alloc function return values 2010-11-10 16:28:31 -08:00
InterfaceIdleMode.c beceem: make local functions static 2010-11-01 12:37:05 -04:00
InterfaceIdleMode.h beceem: make local functions static 2010-11-01 12:37:05 -04:00
InterfaceInit.c Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 2011-01-10 16:04:53 -08:00
InterfaceInit.h Staging: Beceem: add USB id for BCSM250 Mobile WiMAX 2010-12-06 16:09:43 -08:00
InterfaceIsr.c drivers/staging: Remove unnecessary semicolons 2010-11-16 12:06:47 -08:00
InterfaceIsr.h
InterfaceMacros.h
InterfaceMisc.c Staging: bcm: signedness bug in StoreSFParam() 2010-11-16 12:31:50 -08:00
InterfaceMisc.h beceem: remove indirection to Adapter structure 2010-11-01 09:52:14 -04:00
InterfaceRx.c beceem: statistics and transmit queue changes 2010-11-01 13:53:30 -04:00
InterfaceRx.h
InterfaceTx.c Staging: Beceem: remove old kernel compatibility code 2010-12-06 16:09:45 -08:00
InterfaceTx.h beceem: remove dead code 2010-11-01 09:50:16 -04:00
Ioctl.h staging/bcm: add sparse annotations 2010-10-05 08:50:15 -07:00
IPv6Protocol.c beceem: make local functions static 2010-11-01 12:37:05 -04:00
IPv6ProtocolHdr.h beceem: make local functions static 2010-11-01 12:37:05 -04:00
Kconfig
LeakyBucket.c beceem: eliminate unused bcm_jiffies 2010-11-01 13:57:35 -04:00
led_control.c beceem: statistics and transmit queue changes 2010-11-01 13:53:30 -04:00
led_control.h
Macros.h beceem: off by one on queue index 2010-11-01 12:37:48 -04:00
Makefile beceem: remove ARP spoofing 2010-11-01 09:53:58 -04:00
Misc.c Staging: Beceem: remove old kernel compatibility code 2010-12-06 16:09:45 -08:00
nvm.c beceem: change startup messages 2010-11-01 14:06:24 -04:00
nvm.h beceem: eliminate dead code 2010-10-29 20:44:57 -07:00
PHSDefines.h staging/bcm: fix most build warnings 2010-10-05 08:50:15 -07:00
PHSModule.c beceem: make local functions static 2010-11-01 12:37:05 -04:00
PHSModule.h beceem: make local functions static 2010-11-01 12:37:05 -04:00
Protocol.h beceem: fix definition of VLAN header type 2010-11-01 13:54:21 -04:00
Prototypes.h beceem: change startup messages 2010-11-01 14:06:24 -04:00
Qos.c beceem: eliminate unused bcm_jiffies 2010-11-01 13:57:35 -04:00
Queue.h
sort.c
target_params.h
TODO beceem: update TODO list 2010-11-01 14:18:16 -04:00
Transmit.c beceem: dump control packet information 2010-11-01 14:10:41 -04:00
Typedefs.h
vendorspecificextn.c
vendorspecificextn.h
Version.h