David S. Miller ff9c38bba3 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ...

Conflicts:
	net/mac80211/ht.c

2009-12-01 22:13:38 -08: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: vt665x: remove tbit.h

2009-09-15 12:02:08 -07: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: vt665x: Remove umem.h Part 2

2009-09-15 12:02:08 -07: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

Staging: Add pristine upstream vt6656 driver sources to drivers/staging/vt6656.

2009-09-15 12:01:32 -07:00

datarate.c

Staging: vt665x: Clean up include files, Part 1

2009-09-15 12:02:07 -07:00

datarate.h

Staging: Add pristine upstream vt6656 driver sources to drivers/staging/vt6656.

2009-09-15 12:01:32 -07:00

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: vt665x: fix built-in compiling

2009-09-15 12:02:34 -07: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: vt665x: Remove umem.h Part 2

2009-09-15 12:02:08 -07:00

firmware.h

Staging: vt665x: Clean up include files, Part 1

2009-09-15 12:02:07 -07:00

hostap.c

Staging: vt665x: Clean up include files, Part 1

2009-09-15 12:02:07 -07: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: vt665x: Remove umem.h Part 2

2009-09-15 12:02:08 -07: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: vt665x: Remove umem.h Part 2

2009-09-15 12:02:08 -07:00

iwctl.h

Staging: vt665x: Clean up include files, Part 1

2009-09-15 12:02:07 -07:00

kcompat.h

Staging: vt665x: cleanup USB definitions

2009-09-15 12:02:08 -07:00

Kconfig

staging: Add proper selection of WIRELESS_EXT and WEXT_PRIV

2009-10-07 16:39:43 -04: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

Staging: vt6656: fix the memory free bug in vntwusb_disconnect()

2009-10-30 14:47:43 -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: vt665x: Clean up include files, Part 1

2009-09-15 12:02:07 -07: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

Staging: Add pristine upstream vt6656 driver sources to drivers/staging/vt6656.

2009-09-15 12:01:32 -07:00

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

Staging: Add pristine upstream vt6656 driver sources to drivers/staging/vt6656.

2009-09-15 12:01:32 -07:00

rxtx.c

Staging: vt665x: remove tbit.h

2009-09-15 12:02:08 -07: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

Staging: Add pristine upstream vt6656 driver sources to drivers/staging/vt6656.

2009-09-15 12:01:32 -07:00

wcmd.c

Staging: vt665x: Remove umem.h Part 2

2009-09-15 12:02:08 -07: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: vt665x: Remove umem.h Part 2

2009-09-15 12:02:08 -07: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