Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-22 19:01:37 +00:00
Code Issues Packages Projects Releases Wiki Activity
6c3118e230
linux/drivers/staging/vt6656
History
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 Staging: vt665x: Clean up include files, Part 1 2009-09-15 12:02:07 -07:00
80211mgr.c Staging: vt665x: Clean up include files, Part 1 2009-09-15 12:02:07 -07:00
80211mgr.h Staging: vt665x: Clean up include files, Part 1 2009-09-15 12:02:07 -07:00
aes_ccmp.c Staging: vt665x: Remove umem.h Part 2 2009-09-15 12:02:08 -07:00
aes_ccmp.h Staging: vt665x: Clean up include files, Part 1 2009-09-15 12:02:07 -07:00
baseband.c Staging: fix assorted typos all over the place 2009-12-11 12:23:20 -08:00
baseband.h Staging: vt665x: Clean up include files, Part 1 2009-09-15 12:02:07 -07:00
bssdb.c Staging: vt665x: remove tbit.h 2009-09-15 12:02:08 -07:00
bssdb.h Staging: vt665x: Clean up include files, Part 1 2009-09-15 12:02:07 -07:00
card.c Staging: vt665x: remove tbit.h 2009-09-15 12:02:08 -07:00
card.h Staging: vt665x: Clean up include files, Part 1 2009-09-15 12:02:07 -07:00
channel.c Staging: fix assorted typos all over the place 2009-12-11 12:23:20 -08:00
channel.h Staging: vt665x: Clean up include files, Part 1 2009-09-15 12:02:07 -07:00
control.c Staging: vt665x: Remove umem.h Part 2 2009-09-15 12:02:08 -07:00
control.h Staging: vt665x: Clean up include files, Part 1 2009-09-15 12:02:07 -07:00
country.h
datarate.c Staging: vt665x: Clean up include files, Part 1 2009-09-15 12:02:07 -07:00
datarate.h
desc.h Staging: vt665x: Clean up include files, Part 1 2009-09-15 12:02:07 -07:00
device_cfg.h Staging: vt665x: Typedef and macro cleanup Part 1 2009-09-15 12:02:07 -07:00
device.h Staging: vt6656 remove unneeded version.h and version check 2009-12-11 12:23:17 -08:00
dpc.c Staging: vt665x: remove tbit.h 2009-09-15 12:02:08 -07:00
dpc.h Staging: vt665x: Clean up include files, Part 1 2009-09-15 12:02:07 -07:00
firmware.c Staging: vt665*: fix printk formats 2009-12-11 12:23:18 -08:00
firmware.h Staging: vt665x: Clean up include files, Part 1 2009-09-15 12:02:07 -07:00
hostap.c Staging: vt6656 remove duplicate includes 2009-12-11 12:23:17 -08:00
hostap.h Staging: vt665x: Clean up include files, Part 1 2009-09-15 12:02:07 -07:00
int.c Staging: vt665x: remove tbit.h 2009-09-15 12:02:08 -07:00
int.h Staging: vt665x: Clean up include files, Part 1 2009-09-15 12:02:07 -07:00
iocmd.h Staging: vt665x: Clean up include files, Part 1 2009-09-15 12:02:07 -07:00
ioctl.c Staging: fix assorted typos all over the place 2009-12-11 12:23:20 -08:00
ioctl.h Staging: vt665x: Clean up include files, Part 1 2009-09-15 12:02:07 -07:00
iowpa.h Staging: vt665x: Clean up include files, Part 1 2009-09-15 12:02:07 -07:00
iwctl.c Staging: fix assorted typos all over the place 2009-12-11 12:23:20 -08:00
iwctl.h Staging: vt665x: Clean up include files, Part 1 2009-09-15 12:02:07 -07:00
Kconfig Staging/vt66*: kconfig, depends on WLAN 2009-12-23 11:27:50 -08:00
key.c Staging: vt665x: remove tbit.h 2009-09-15 12:02:08 -07:00
key.h Staging: vt665x: Clean up include files, Part 1 2009-09-15 12:02:07 -07:00
mac.c Staging: vt665x: remove tbit.h 2009-09-15 12:02:08 -07:00
mac.h Staging: vt665x: Remove umem.h Part 2 2009-09-15 12:02:08 -07:00
main_usb.c net: convert multicast list to list_head 2010-04-03 14:22:15 -07:00
Makefile Staging: vt665x: fix built-in compiling 2009-09-15 12:02:34 -07:00
mib.c Staging: vt665x: remove tbit.h 2009-09-15 12:02:08 -07:00
mib.h Staging: fix assorted typos all over the place 2009-12-11 12:23:20 -08:00
michael.c Staging: vt665x: remove tbit.h 2009-09-15 12:02:08 -07:00
michael.h Staging: vt665x: Remove umem.h Part 2 2009-09-15 12:02:08 -07:00
power.c Staging: vt665x: remove tbit.h 2009-09-15 12:02:08 -07:00
power.h
rc4.c Staging: vt665x: Clean up include files, Part 1 2009-09-15 12:02:07 -07:00
rc4.h Staging: vt665x: Clean up include files, Part 1 2009-09-15 12:02:07 -07:00
rf.c Staging: vt665x: Clean up include files, Part 1 2009-09-15 12:02:07 -07:00
rf.h Staging: vt665x: Clean up include files, Part 1 2009-09-15 12:02:07 -07:00
rndis.h
rxtx.c Fix comment and Kconfig typos for 'require' and 'fragment' 2010-03-29 15:41:47 +02:00
rxtx.h Staging: vt665x: Clean up include files, Part 1 2009-09-15 12:02:07 -07:00
srom.h Staging: vt665x: Clean up include files, Part 1 2009-09-15 12:02:07 -07:00
tcrc.c Staging: vt665x: remove tbit.h 2009-09-15 12:02:08 -07:00
tcrc.h Staging: vt665x: Clean up include files, Part 1 2009-09-15 12:02:07 -07:00
tether.c Staging: vt665x: remove tbit.h 2009-09-15 12:02:08 -07:00
tether.h Staging: vt665x: Clean up include files, Part 1 2009-09-15 12:02:07 -07:00
tkip.c Staging: vt665x: remove tbit.h 2009-09-15 12:02:08 -07:00
tkip.h Staging: vt665x: Clean up include files, Part 1 2009-09-15 12:02:07 -07:00
tmacro.h Staging: vt665x: Clean up include files, Part 1 2009-09-15 12:02:07 -07:00
TODO Staging: update TODO files 2009-11-30 16:39:42 -08:00
ttype.h Staging: vt665x: Typedef and macro cleanup Part 1 2009-09-15 12:02:07 -07:00
upc.h Staging: vt665x: Clean up include files, Part 1 2009-09-15 12:02:07 -07:00
usbpipe.c Staging: vt665x: cleanup USB definitions 2009-09-15 12:02:08 -07:00
usbpipe.h Staging: vt665x: Clean up include files, Part 1 2009-09-15 12:02:07 -07:00
vntconfiguration.dat
wcmd.c Staging: fix assorted typos all over the place 2009-12-11 12:23:20 -08:00
wcmd.h Staging: vt665x: Clean up include files, Part 1 2009-09-15 12:02:07 -07:00
wctl.c Staging: vt665x: Clean up include files, Part 1 2009-09-15 12:02:07 -07:00
wctl.h Staging: vt665x: Clean up include files, Part 1 2009-09-15 12:02:07 -07:00
wmgr.c Staging: vt665x: remove tbit.h 2009-09-15 12:02:08 -07:00
wmgr.h Staging: vt665x: Clean up include files, Part 1 2009-09-15 12:02:07 -07:00
wpa2.c Staging: vt665x: Remove umem.h Part 2 2009-09-15 12:02:08 -07:00
wpa2.h Staging: vt665x: Clean up include files, Part 1 2009-09-15 12:02:07 -07:00
wpa.c Staging: vt665*: fix printk formats 2009-12-11 12:23:18 -08:00
wpa.h Staging: vt665x: Clean up include files, Part 1 2009-09-15 12:02:07 -07:00
wpactl.c Staging: vt665x: Clean up include files, Part 1 2009-09-15 12:02:07 -07:00
wpactl.h Staging: vt665x: Clean up include files, Part 1 2009-09-15 12:02:07 -07:00