OpenCloudOS-Kernel/net/wimax
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
..
Kconfig wimax: depend on rfkill properly 2009-06-04 10:58:15 -04:00
Makefile wimax: Add netlink interface to get device state 2009-05-28 18:02:20 -07:00
debug-levels.h wimax: Add netlink interface to get device state 2009-05-28 18:02:20 -07:00
debugfs.c wimax: Add netlink interface to get device state 2009-05-28 18:02:20 -07:00
id-table.c wimax: fix oops in wimax_dev_get_by_genl_info() when looking up non-wimax iface 2009-02-12 17:00:20 -08:00
op-msg.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
op-reset.c wimax: remove unneeded variable 2010-03-24 13:34:09 -07:00
op-rfkill.c Fix typos in comments 2010-03-16 11:47:56 +01:00
op-state-get.c wimax: remove unneeded variable 2010-03-24 13:34:09 -07:00
stack.c net: Remove unnecessary returns from void function()s 2010-05-17 23:23:14 -07:00
wimax-internal.h wimax: internal API for the kernel space WiMAX stack 2009-01-07 10:00:16 -08:00