Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-01 01:31:44 +00:00
Code Issues Packages Projects Releases Wiki Activity
203209ef77
linux/drivers/staging/rtl8187se
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
..
ieee80211 drivers/staging/rtl8187se: Don't pass huge struct by value 2011-08-23 14:46:05 -07:00
Kconfig staging/rtl81*: build as loadable modules only 2011-04-04 22:46:15 -07:00
Makefile drivers/staging: do not use EXTRA_CFLAGS 2011-08-23 15:24:46 -07:00
r8180_93cx6.h staging: r8187se: Change to use common eeprom routines in EEPROM_93CX 2010-03-03 16:42:57 -08:00
r8180_core.c net: remove use of ndo_set_multicast_list in drivers 2011-08-17 20:22:03 -07:00
r8180_dm.c Fix common misspellings 2011-03-31 11:26:23 -03:00
r8180_dm.h Staging: rtl8187se: r8180.h: fixed alot of checkpatch.pl issues 2010-09-21 10:49:31 -07:00
r8180_hw.h Staging: rtl8187se: r8180_hw: fixed a lot of checkpatch.pl issues 2010-09-21 10:49:31 -07:00
r8180_rtl8225.h Staging: rtl8187se: r8180_rtl8225: fixed a lot of checkpatch.pl issues 2010-09-21 10:49:32 -07:00
r8180_rtl8225z2.c drivers/staging/rtl8187se: Don't pass huge struct by value 2011-08-23 14:46:05 -07:00
r8180_wx.c Staging: rtl8187se: r8180_wx: fixed a lot of checkptahc.pl issues 2010-09-21 10:49:32 -07:00
r8180_wx.h
r8180.h net/staging: add needed interrupt.h and hardirq.h includes 2011-06-19 22:41:59 -07:00
r8185b_init.c Fix common misspellings 2011-03-31 11:26:23 -03:00
TODO staging: r8187se: Change to use common eeprom routines in EEPROM_93CX 2010-03-03 16:42:57 -08:00