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	Staging: rtl8192u: ieee80211: Makefile: remove unneeded stuff	2011-10-18 13:36:18 -07:00
authors
changes
copying
dot11d.h	Staging: rtl8192u: remove dead code to disable dot11d	2010-12-01 14:51:16 -08:00
ieee80211_crypt.h
Kconfig	staging/rtl81*: build as loadable modules only	2011-04-04 22:46:15 -07:00
Makefile	Staging: rtl8192u: remove dead code to disable dot11d	2010-12-01 14:51:16 -08:00
r819xU_cmdpkt.c
r819xU_cmdpkt.h
r819xU_firmware_img.c	rtl8192u_usb: Remove built-in firmware images	2011-01-21 12:19:11 -08:00
r819xU_firmware_img.h	rtl8192u_usb: Remove built-in firmware images	2011-01-21 12:19:11 -08:00
r819xU_firmware.c	staging: rtl8192u: declare MODULE_FIRMWARE	2011-08-02 16:07:50 -07:00
r819xU_firmware.h
r819xU_HTGen.h
r819xU_HTType.h	Fix common misspellings	2011-03-31 11:26:23 -03:00
r819xU_phy.c	Fix common misspellings	2011-03-31 11:26:23 -03:00
r819xU_phy.h
r819xU_phyreg.h
r8180_93cx6.c
r8180_93cx6.h
r8180_pm.c
r8180_pm.h
r8190_rtl8256.c
r8190_rtl8256.h
r8192U_core.c	net: remove use of ndo_set_multicast_list in drivers	2011-08-17 20:22:03 -07:00
r8192U_dm.c
r8192U_dm.h
r8192U_hw.h
r8192U_wx.c	Staging: rtl8192u: remove dead code to disable dot11d	2010-12-01 14:51:16 -08:00
r8192U_wx.h
r8192U.h	Remove unneeded version.h includes from drivers/staging/rtl*/	2011-07-05 10:39:40 -07:00