linux-stable-rt/drivers/staging/vt6655
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
..
80211hdr.h
80211mgr.c
80211mgr.h
IEEE11h.c
IEEE11h.h
Kconfig
Makefile
TODO
aes_ccmp.c
aes_ccmp.h
baseband.c
baseband.h
bssdb.c
bssdb.h
card.c
card.h
country.h
datarate.c
datarate.h
desc.h
device.h
device_cfg.h
device_main.c Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2010-04-11 14:53:53 -07:00
dpc.c
dpc.h
hostap.c
hostap.h
iocmd.h
ioctl.c
ioctl.h
iowpa.h
iwctl.c
iwctl.h
key.c
key.h
mac.c
mac.h
mib.c
mib.h
michael.c
michael.h
power.c
power.h
rc4.c
rc4.h
rf.c
rf.h
rxtx.c Fix comment and Kconfig typos for 'require' and 'fragment' 2010-03-29 15:41:47 +02:00
rxtx.h
srom.c
srom.h
tcrc.c
tcrc.h
test
tether.c
tether.h
tkip.c
tkip.h
tmacro.h
ttype.h
upc.h
vntconfiguration.dat
vntwifi.c
vntwifi.h
wcmd.c
wcmd.h
wctl.c
wctl.h
wmgr.c
wmgr.h
wpa.c
wpa.h
wpa2.c
wpa2.h
wpactl.c
wpactl.h
wroute.c
wroute.h