Greg Kroah-Hartman 6a2a2cdd57 Merge 3.6-rc6 into staging-next ...

This pulls in the staging tree fixes in 3.6-rc6 into our branch to resolve the
merge issues.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

2012-09-16 17:17:25 -07:00

..

80211hdr.h

staging: vt6656: Remove all commented macros

2012-07-09 12:43:25 -07:00

80211mgr.c

…

80211mgr.h

staging "vt6656" Fix typos in comments, and in a printk message.

2012-09-04 14:00:56 -07:00

aes_ccmp.c

…

aes_ccmp.h

…

baseband.c

staging "vt6656" Typo rename Caculate to Calculate.

2012-09-04 14:00:56 -07:00

baseband.h

staging "vt6656" Typo rename Caculate to Calculate.

2012-09-04 14:00:56 -07:00

bssdb.c

staging "vt6656" Fix typos in comments, and in a printk message.

2012-09-04 14:00:56 -07:00

bssdb.h

staging: vt6656: Remove all commented macros

2012-07-09 12:43:25 -07:00

card.c

staging "vt6656" Typo rename Caculate to Calculate.

2012-09-04 14:00:56 -07:00

card.h

staging: vt6656: Remove all commented macros

2012-07-09 12:43:25 -07:00

channel.c

staging: vt6656: Remove unsed macros

2012-07-09 12:43:26 -07:00

channel.h

…

control.c

…

control.h

…

country.h

…

datarate.c

…

datarate.h

…

desc.h

staging: vt6656: desc.h: Remove commented macros and useless comments

2012-07-09 12:43:25 -07:00

device_cfg.h

…

device.h

staging "vt6656" Fix typos in comments, and in a printk message.

2012-09-04 14:00:56 -07:00

dpc.c

Merge 3.6-rc6 into staging-next

2012-09-16 17:17:25 -07:00

dpc.h

…

firmware.c

…

firmware.h

…

hostap.c

Staging: vt6656: using is_broadcast_ether_addr() to simplify the code

2012-09-04 14:01:42 -07:00

hostap.h

…

int.c

staging "vt6656" Fix typos in comments, and in a printk message.

2012-09-04 14:00:56 -07:00

int.h

staging: vt6656: int.h: Fix indentation and spacing

2012-07-06 16:10:53 -07:00

iocmd.h

…

ioctl.c

staging "vt6656" Fix typos in comments, and in a printk message.

2012-09-04 14:00:56 -07:00

ioctl.h

…

iowpa.h

…

iwctl.c

staging "vt6656" Fix typos in comments, and in a printk message.

2012-09-04 14:00:56 -07:00

iwctl.h

staging: vt6656: iwctl: Fix up variable declarations (whitespace and 'one-per-line')

2012-06-25 11:17:37 -07:00

Kconfig

…

key.c

staging "vt6656" Fix typos in comments, and in a printk message.

2012-09-04 14:00:56 -07:00

key.h

…

mac.c

…

mac.h

…

main_usb.c

staging "vt6656" Fix typos in comments, and in a printk message.

2012-09-04 14:00:56 -07:00

Makefile

…

mib.c

…

mib.h

staging: vt6656: Remove all commented macros

2012-07-09 12:43:25 -07:00

michael.c

…

michael.h

…

power.c

staging "vt6656" Fix typos in comments, and in a printk message.

2012-09-04 14:00:56 -07:00

power.h

…

rc4.c

…

rc4.h

…

rf.c

staging "vt6656" Typo rename Embeded to Embedded.

2012-09-04 14:00:56 -07:00

rf.h

staging "vt6656" Typo rename Embeded to Embedded.

2012-09-04 14:00:56 -07:00

rndis.h

…

rxtx.c

Merge 3.6-rc6 into staging-next

2012-09-16 17:17:25 -07:00

rxtx.h

…

srom.h

…

tcrc.c

staging "vt6656" Fix typos in comments, and in a printk message.

2012-09-04 14:00:56 -07:00

tcrc.h

staging "vt6656" Fix typos in comments, and in a printk message.

2012-09-04 14:00:56 -07:00

tether.c

staging "vt6656" Fix typos in comments, and in a printk message.

2012-09-04 14:00:56 -07:00

tether.h

staging: vt6656: Remove all commented macros

2012-07-09 12:43:25 -07:00

tkip.c

staging "vt6656" Fix typos in comments, and in a printk message.

2012-09-04 14:00:56 -07:00

tkip.h

…

tmacro.h

…

TODO

…

ttype.h

…

upc.h

…

usbpipe.c

staging: vt6656: Remove all commented macros

2012-07-09 12:43:25 -07:00

usbpipe.h

…

vntconfiguration.dat

…

wcmd.c

staging "vt6656" Fix typos in comments, and in a printk message.

2012-09-04 14:00:56 -07:00

wcmd.h

…

wctl.c

staging "vt6656" Fix typos in comments, and in a printk message.

2012-09-04 14:00:56 -07:00

wctl.h

…

wmgr.c

staging "vt6656" Fix typos in comments, and in a printk message.

2012-09-04 14:00:56 -07:00

wmgr.h

…

wpa2.c

staging "vt6656" Fix typos in comments, and in a printk message.

2012-09-04 14:00:56 -07:00

wpa2.h

…

wpa.c

staging "vt6656" Fix typos in comments, and in a printk message.

2012-09-04 14:00:56 -07:00

wpa.h

…

wpactl.c

staging "vt6656" Fix typos in comments, and in a printk message.

2012-09-04 14:00:56 -07:00

wpactl.h

…