Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-06 12:11:59 +00:00
Code Issues Packages Projects Releases Wiki Activity
aa77677e0a
linux/drivers/staging/vt6656
History
Linus Torvalds aa77677e0a Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging 
* 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (1519 commits)
  staging: et131x: Remove redundant check and return statement
  staging: et131x: Mainly whitespace changes to appease checkpatch
  staging: et131x: Remove last of the forward declarations
  staging: et131x: Remove even more forward declarations
  staging: et131x: Remove yet more forward declarations
  staging: et131x: Remove more forward declarations
  staging: et131x: Remove forward declaration of et131x_adapter_setup
  staging: et131x: Remove some forward declarations
  staging: et131x: Remove unused rx_ring.recv_packet_pool
  staging: et131x: Remove call to find pci pm capability
  staging: et131x: Remove redundant et131x_reset_recv() call
  staging: et131x: Remove unused rx_ring.recv_buffer_pool
  Staging: bcm: Fix three initialization errors in InterfaceDld.c
  Staging: bcm: Fix coding style issues in InterfaceDld.c
  staging:iio:dac: Add AD5360 driver
  staging:iio:trigger:bfin-timer: Fix compile error
  Staging: vt6655: add some range checks before memcpy()
  Staging: vt6655: whitespace fixes to iotcl.c
  Staging: vt6656: add some range checks before memcpy()
  Staging: vt6656: whitespace cleanups in ioctl.c
  ...

Fix up conflicts in:
 - drivers/{Kconfig,Makefile}, drivers/staging/{Kconfig,Makefile}:
	vg driver movement
 - drivers/staging/brcm80211/brcmfmac/{dhd_linux.c,mac80211_if.c}:
	driver removal vs now stale changes
 - drivers/staging/rtl8192e/r8192E_core.c:
	driver removal vs now stale changes
 - drivers/staging/et131x/et131*:
	driver consolidation into one file, tried to do fixups
2011-10-26 15:39:02 +02:00
..
80211hdr.h staging: vt6656: cleared checkpatch.pl findings in 80211hdr.h 2010-05-11 11:35:55 -07:00
80211mgr.c Staging: vt665*: fix typos concerning "management" 2010-06-18 10:42:07 -07:00
80211mgr.h staging: vt6656: removed not useful comments 2010-08-31 11:14:39 -07:00
aes_ccmp.c Staging: vt6656: fix up built-in compilation together with rt2870 2010-06-18 10:37:48 -07:00
aes_ccmp.h Staging: vt6656: code cleanup, fixed comments style at the end of headers 2010-05-11 11:36:01 -07:00
baseband.c drivers/staging: Remove unnecessary semicolons 2010-11-16 12:06:47 -08:00
baseband.h Staging: vt6656: code cleanup, resolved checkpatch findings in headers 2010-06-18 10:35:33 -07:00
bssdb.c staging: Remove unnecessary semicolons when if (foo) {...}; 2011-04-25 16:58:34 -07:00
bssdb.h Staging: vt6656: Remove PUINT from ttype.h 2010-08-02 18:16:27 -07:00
card.c staging: vt6656: resolved checkpatch finding 2010-11-09 15:55:53 -08:00
card.h Staging: vt6656: removed custom UCHAR/USHORT/UINT/ULONG/ULONGLONG typedefs 2010-05-18 14:51:08 -07:00
channel.c staging: vt6656: removed dummy errors like extra spaces 2010-09-16 12:37:35 -07:00
channel.h Staging: vt6656: code cleanup, resolved checkpatch findings in headers 2010-06-18 10:35:33 -07:00
control.c staging: vt6656: removed NTSTATUS definition 2010-08-02 18:19:04 -07:00
control.h Staging: vt6656: code cleanup, resolved checkpatch findings in headers 2010-06-18 10:35:33 -07:00
country.h
datarate.c staging: vt6656: removed '#if 1'/'#if 0' definitions 2010-07-22 11:42:00 -07:00
datarate.h Staging: vt6656: removed custom UCHAR/USHORT/UINT/ULONG/ULONGLONG typedefs 2010-05-18 14:51:08 -07:00
desc.h Staging: vt6656: code cleanup, resolved checkpatch findings in headers 2010-06-18 10:35:33 -07:00
device_cfg.h Staging: vt6656: code cleanup, resolved checkpatch findings in headers 2010-06-18 10:35:33 -07:00
device.h vt6656: Use request_firmware() to load firmware 2011-01-21 12:19:11 -08:00
dpc.c staging: vt6656: use %pM for printing MACs 2011-08-23 14:36:18 -07:00
dpc.h Staging: vt6656: removed custom UCHAR/USHORT/UINT/ULONG/ULONGLONG typedefs 2010-05-18 14:51:08 -07:00
firmware.c staging: vt6656: Remove NULL check before kfree 2011-03-14 11:57:37 -07:00
firmware.h Staging: vt6656: code cleanup, fixed comments style at the end of headers 2010-05-11 11:36:01 -07:00
hostap.c staging: vt6656: Remove NULL check before kfree 2011-03-14 11:57:37 -07:00
hostap.h Staging: vt6656: code cleanup, fixed comments style at the end of headers 2010-05-11 11:36:01 -07:00
int.c staging: vt6656: removed NTSTATUS definition 2010-08-02 18:19:04 -07:00
int.h staging: vt6656: removed NTSTATUS definition 2010-08-02 18:19:04 -07:00
iocmd.h Staging: vt665x: remove unused DEF definition 2010-09-16 13:02:36 -07:00
ioctl.c Staging: vt6656: add some range checks before memcpy() 2011-10-23 10:13:20 +02:00
ioctl.h Staging: vt6656: removed custom UCHAR/USHORT/UINT/ULONG/ULONGLONG typedefs 2010-05-18 14:51:08 -07:00
iowpa.h Staging: vt6656: code cleanup, resolved checkpatch findings in headers 2010-06-18 10:35:33 -07:00
iwctl.c drivers/staging: Remove unnecessary semicolons 2010-11-16 12:06:47 -08:00
iwctl.h staging: vt6656: removed not useful comments 2010-08-31 11:14:39 -07:00
Kconfig Staging: vt665?: prevent modules from being built into the kernel. 2011-04-04 21:33:26 -07:00
key.c staging: vt6656: resolved checkpatch finding 2010-08-31 11:35:06 -07:00
key.h Staging: vt6656: removed custom UCHAR/USHORT/UINT/ULONG/ULONGLONG typedefs 2010-05-18 14:51:08 -07:00
mac.c staging: vt6656: Fixed indentation with spaces 2010-09-16 12:37:35 -07:00
mac.h Staging: vt6656: code cleanup, resolved checkpatch findings in headers 2010-06-18 10:35:33 -07:00
main_usb.c Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging 2011-10-26 15:39:02 +02:00
Makefile Staging: vt6656: Makefile: cleaned up Makefile cflag lines 2010-10-05 11:56:38 -07:00
mib.c staging: vt6656: removed NTSTATUS definition 2010-08-02 18:19:04 -07:00
mib.h staging: vt6656: removed NTSTATUS definition 2010-08-02 18:19:04 -07:00
michael.c Staging: vt6656: code cleanup, fixed 'for' statements 2010-06-18 10:34:59 -07:00
michael.h Staging: vt6656: code cleanup, resolved checkpatch findings in headers 2010-06-18 10:35:33 -07:00
power.c Staging: vt6656: Clean up switching to power saving mode. 2011-03-02 15:52:30 -05:00
power.h Staging: vt665*: fix typos concerning "management" 2010-06-18 10:42:07 -07:00
rc4.c Staging: vt6656: removed custom UCHAR/USHORT/UINT/ULONG/ULONGLONG typedefs 2010-05-18 14:51:08 -07:00
rc4.h Staging: vt6656: removed custom UCHAR/USHORT/UINT/ULONG/ULONGLONG typedefs 2010-05-18 14:51:08 -07:00
rf.c Staging: vt6656: removed custom UCHAR/USHORT/UINT/ULONG/ULONGLONG typedefs 2010-05-18 14:51:08 -07:00
rf.h Staging: vt6656: code cleanup, resolved checkpatch findings in headers 2010-06-18 10:35:33 -07:00
rndis.h Staging: vt6656: code cleanup, resolved checkpatch findings in headers 2010-06-18 10:35:33 -07:00
rxtx.c staging: Remove unnecessary semicolons when if (foo) {...}; 2011-04-25 16:58:34 -07:00
rxtx.h staging: vt6656: removed NTSTATUS definition 2010-08-02 18:19:04 -07:00
srom.h Staging: vt6656: code cleanup, fixed comments style at the end of headers 2010-05-11 11:36:01 -07:00
tcrc.c Staging: vt6656: removed custom UCHAR/USHORT/UINT/ULONG/ULONGLONG typedefs 2010-05-18 14:51:08 -07:00
tcrc.h Staging: vt6656: removed custom UCHAR/USHORT/UINT/ULONG/ULONGLONG typedefs 2010-05-18 14:51:08 -07:00
tether.c Staging: vt6656: removed custom UCHAR/USHORT/UINT/ULONG/ULONGLONG typedefs 2010-05-18 14:51:08 -07:00
tether.h staging: vt6656: removed custom definitions of Ethernet packet types 2010-08-31 11:31:25 -07:00
tkip.c staging: vt6656 resolved parenthesis not spaces 2010-11-09 15:55:54 -08:00
tkip.h Staging: vt6656: code cleanup, fixed comments style at the end of headers 2010-05-11 11:36:01 -07:00
tmacro.h Staging: vt6656: code cleanup, fixed comments style at the end of headers 2010-05-11 11:36:01 -07:00
TODO
ttype.h Staging: vt6656: Remove PUINT from ttype.h 2010-08-02 18:16:27 -07:00
upc.h Staging: vt6656: removed custom UCHAR/USHORT/UINT/ULONG/ULONGLONG typedefs 2010-05-18 14:51:08 -07:00
usbpipe.c staging: vt6656: removed macro to test bits 2010-08-31 11:31:26 -07:00
usbpipe.h staging: vt6656: removed NTSTATUS definition 2010-08-02 18:19:04 -07:00
vntconfiguration.dat
wcmd.c staging: Remove unnecessary semicolons when if (foo) {...}; 2011-04-25 16:58:34 -07:00
wcmd.h staging: vt6656: removed TxInSleep definition 2010-07-08 13:01:05 -07:00
wctl.c staging: vt6656: replace IS_ETH_ADDRESS_EQUAL with compare_ether_addr 2010-06-24 14:15:07 -07:00
wctl.h Staging: vt6656: removed custom UCHAR/USHORT/UINT/ULONG/ULONGLONG typedefs 2010-05-18 14:51:08 -07:00
wmgr.c staging: vt6656: use %pM for printing MACs 2011-08-23 14:36:18 -07:00
wmgr.h Fix common misspellings 2011-03-31 11:26:23 -03:00
wpa2.c drivers/staging: Remove unnecessary semicolons 2010-11-16 12:06:47 -08:00
wpa2.h Staging: vt6656: code cleanup, resolved checkpatch findings in headers 2010-06-18 10:35:33 -07:00
wpa.c staging: vt6656: removed extra spaces 2010-08-31 11:35:05 -07:00
wpa.h Staging: vt6656: code cleanup, fixed comments style at the end of headers 2010-05-11 11:36:01 -07:00
wpactl.c Staging: vt6656: potential memory corruption 2011-09-29 17:34:50 -07:00
wpactl.h Staging: vt6656: removed custom UCHAR/USHORT/UINT/ULONG/ULONGLONG typedefs 2010-05-18 14:51:08 -07:00