2
0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-26 22:24:09 +08:00
linux-next/drivers/net/wireless/orinoco
Linus Torvalds f8965467f3 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1674 commits)
  qlcnic: adding co maintainer
  ixgbe: add support for active DA cables
  ixgbe: dcb, do not tag tc_prio_control frames
  ixgbe: fix ixgbe_tx_is_paused logic
  ixgbe: always enable vlan strip/insert when DCB is enabled
  ixgbe: remove some redundant code in setting FCoE FIP filter
  ixgbe: fix wrong offset to fc_frame_header in ixgbe_fcoe_ddp
  ixgbe: fix header len when unsplit packet overflows to data buffer
  ipv6: Never schedule DAD timer on dead address
  ipv6: Use POSTDAD state
  ipv6: Use state_lock to protect ifa state
  ipv6: Replace inet6_ifaddr->dead with state
  cxgb4: notify upper drivers if the device is already up when they load
  cxgb4: keep interrupts available when the ports are brought down
  cxgb4: fix initial addition of MAC address
  cnic: Return SPQ credit to bnx2x after ring setup and shutdown.
  cnic: Convert cnic_local_flags to atomic ops.
  can: Fix SJA1000 command register writes on SMP systems
  bridge: fix build for CONFIG_SYSFS disabled
  ARCNET: Limit com20020 PCI ID matches for SOHARD cards
  ...

Fix up various conflicts with pcmcia tree drivers/net/
{pcmcia/3c589_cs.c, wireless/orinoco/orinoco_cs.c and
wireless/orinoco/spectrum_cs.c} and feature removal
(Documentation/feature-removal-schedule.txt).

Also fix a non-content conflict due to pm_qos_requirement getting
renamed in the PM tree (now pm_qos_request) in net/mac80211/scan.c
2010-05-20 21:04:44 -07:00
..
airport.c orinoco: encapsulate driver locking 2010-05-03 14:53:07 -04:00
cfg.c cfg80211/mac80211: better channel handling 2010-05-07 14:55:50 -04:00
cfg.h
fw.c Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem 2010-05-05 16:14:16 -04:00
fw.h
hermes_dld.c orinoco_usb: implement fw download 2010-05-03 14:53:09 -04:00
hermes_dld.h
hermes_rid.h
hermes.c orinoco_usb: implement fw download 2010-05-03 14:53:09 -04:00
hermes.h orinoco_usb: implement fw download 2010-05-03 14:53:09 -04:00
hw.c Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem 2010-05-05 16:14:16 -04:00
hw.h net: convert multicast list to list_head 2010-04-03 14:22:15 -07:00
Kconfig orinoco: add orinoco_usb driver 2010-05-03 14:53:08 -04:00
main.c drivers/net: Remove unnecessary returns from void function()s 2010-05-14 00:19:28 -07:00
main.h orinoco: use cfg80211_find_ie 2010-04-19 16:41:42 -04:00
Makefile orinoco: add orinoco_usb driver 2010-05-03 14:53:08 -04:00
mic.c
mic.h
orinoco_cs.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 2010-05-20 21:04:44 -07:00
orinoco_nortel.c orinoco: allow driver to specify netdev_ops 2010-05-03 14:53:06 -04:00
orinoco_pci.c orinoco: allow driver to specify netdev_ops 2010-05-03 14:53:06 -04:00
orinoco_pci.h
orinoco_plx.c orinoco: allow driver to specify netdev_ops 2010-05-03 14:53:06 -04:00
orinoco_tmd.c orinoco: allow driver to specify netdev_ops 2010-05-03 14:53:06 -04:00
orinoco_usb.c orinoco: refactor xmit path 2010-05-07 14:55:49 -04:00
orinoco.h orinoco: refactor xmit path 2010-05-07 14:55:49 -04:00
scan.c Merge branch 'master' into for-davem 2010-04-23 14:43:45 -04:00
scan.h
spectrum_cs.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 2010-05-20 21:04:44 -07:00
wext.c Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem 2010-05-05 16:14:16 -04:00
wext.h