Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-24 21:21:41 +00:00
Code Issues Packages Projects Releases Wiki Activity
0603ba1460
linux/drivers/staging/winbond
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
..
core.h staging: winbond: needs <linux/delay.h> for msleep and friends 2011-02-28 19:14:22 -08:00
Kconfig
localpara.h
mac_structures.h Staging: w35und: Kill unused code in mac_structures.h 2010-12-01 14:45:45 -08:00
Makefile Staging: w35und: Merge mlmetxrx.c to mds.c 2010-12-01 14:45:46 -08:00
mds_f.h Staging: w35und: Kill empty Mds_Destroy function 2010-11-09 16:07:00 -08:00
mds_s.h atomic: use <linux/atomic.h> 2011-07-26 16:49:47 -07:00
mds.c Fix common misspellings 2011-03-31 11:26:23 -03:00
mto.c staging: winbond/mto.c: remove unused variables 2011-04-04 22:55:49 -07:00
mto.h
phy_calibration.c Staging : winbond : fix coding style issue in phy_calibration.c 2011-08-23 15:24:46 -07:00
phy_calibration.h Staging: w35und: Rename wbhal_s.h to wbhal.h 2010-11-09 15:55:55 -08:00
reg.c Staging: w35und: Kill _IBSS_BEACON_SEQ_STICK_ 2010-12-01 14:45:46 -08:00
sme_api.h
TODO staging: w35und: Add locking problems to TODO list 2010-09-21 10:46:04 -07:00
wb35reg_f.h Staging: w35und: Rename wbhal_s.h to wbhal.h 2010-11-09 15:55:55 -08:00
wb35reg_s.h atomic: use <linux/atomic.h> 2011-07-26 16:49:47 -07:00
wb35reg.c staging: winbond: Remove NULL check before kfree 2011-03-14 11:57:38 -07:00
wb35rx_f.h Staging: w35und: Rename wbhal_s.h to wbhal.h 2010-11-09 15:55:55 -08:00
wb35rx_s.h
wb35rx.c Staging: w35und: Kill struct wb_usb 2010-12-01 14:45:47 -08:00
wb35tx_f.h Staging: w35und: Merge wbhal_f.h to wbhal_s.h 2010-11-09 15:55:55 -08:00
wb35tx_s.h
wb35tx.c Staging: winbond: wb35tx.c: Fixed coding style 2011-04-20 13:48:25 -07:00
wbhal.h Staging: w35und: Kill struct wb_usb 2010-12-01 14:45:47 -08:00
wbusb.c mac80211: add ieee80211_vif param to tsf functions 2011-09-27 14:27:48 -04:00