openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity
linux/drivers/staging
History
John W. Linville bf515fb11a This relatively large batch of changes is comprised of the 
following:
  * large mac80211-hwsim changes from Ben, Jukka and a bit myself
  * OCB/WAVE/11p support from Rostislav on behalf of the Czech Technical
    University in Prague and Volkswagen Group Research
  * minstrel VHT work from Karl
  * more CSA work from Luca
  * WMM admission control support in mac80211 (myself)
  * various smaller fixes, spelling corrections, and minor API additions
 -----BEGIN PGP SIGNATURE-----
 
 iQIcBAABCAAGBQJUWMs/AAoJEDBSmw7B7bqrmBQQAIbfAe7wH1WifRtOnhw3zWQQ
 K36+Edf3HlQ+EIkSs63QousRj2e7pGDOyhzMWLaqsmeTLteUtlGbr7qwiJO1QZdf
 Ml2V5O2s+b8hUIClDBVQF2L6+GGUmRUdQqvDDhkN1guoxD/Nk8cNtsRkSdiXWJWy
 R48NzvYDflBhc8uqPtR8jDb10eM3c00YP9HB+w9hYAfizD+FRue7UNp4MQIqwp9V
 HdKRT6L2n/6QA+Mzse0rMDes5qI7nIUNgj+hjqgJSnhITPMgGR5j/pitnVHrr81M
 ngOipBFG3svsQrwZh8nM4Llp0cM4Gs+GlgCieu9+TJpr2sY00Z3kYcp0pxtDoSxz
 Wblqz9n/bnW9mrkEfl12XqwwT5vguchwHoZ9cXhejDxSawWXoTRx20uW4ahO8ArA
 kWwwjTBVsQ5WMCtOBiqggzNKghwCc2ILmcZnjGdg9aNXcWsmQ4vyeCfG2QxBz/UB
 Grv/f9NSy6mzKQ34yv+lyR7rFZ8XcT03EVAnZSYz8X0ZZGxwtFupRp1RrBh1KPtD
 TJoe6Q71FfHKYRJ2xgygYkQFo+r9d0BKBeerq+Vu2hBeaqyi4aUwSj7d1sUaaq6N
 tL8fmAUqFjVOOUFeH1g07Xke5QD+yrEC7sJKkeRMfcRGB+dEa+2m3I5p4WDz9bWM
 AEvFSsYr/I9KI4d1huXD
 =6GIj
 -----END PGP SIGNATURE-----

Merge tag 'mac80211-next-for-john-2014-11-04' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next

Johannes Berg <johannes@sipsolutions.net> says:

"This relatively large batch of changes is comprised of the
following:
 * large mac80211-hwsim changes from Ben, Jukka and a bit myself
 * OCB/WAVE/11p support from Rostislav on behalf of the Czech Technical
   University in Prague and Volkswagen Group Research
 * minstrel VHT work from Karl
 * more CSA work from Luca
 * WMM admission control support in mac80211 (myself)
 * various smaller fixes, spelling corrections, and minor API additions"

Conflicts:
	drivers/net/wireless/ath/wil6210/cfg80211.c

Signed-off-by: John W. Linville <linville@tuxdriver.com>
 		2014-11-04 16:18:12 -05:00
..
android Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs 2014-10-13 11:28:42 +02:00
bcm Staging: bcm: Removed unnecessary else. 2014-10-02 09:33:46 -07:00
board
…
comedi staging: comedi: ni_usb6501: add counter subdevice 2014-09-19 15:58:18 -07:00
cptm1217
…
dgap staging: dgap: use dgap_release_remap() in dgap_cleanup_board() 2014-09-23 23:39:25 -07:00
dgnc TTY/Serial driver patches for 3.18-rc1 2014-10-08 06:52:11 -04:00
emxx_udc staging: emxx_udc: Use min_t instead of min 2014-10-02 13:51:03 -07:00
ft1000 staging: ft1000: ft1000-usb: Removed unnecessary else statement. 2014-10-02 10:13:37 -07:00
fwserial
…
gdm72xx drivers: staging: gdm72xx: Removed unnecessary braces. 2014-09-28 23:27:35 -04:00
gdm724x staging: gdm724x: Removed unnecessary else expression. 2014-09-28 23:27:34 -04:00
goldfish staging: goldfish: avoid multiple assignments 2014-09-06 21:54:57 -07:00
gs_fpgaboot staging: gs_fpgaboot Fix trailing whitespace. 2014-09-19 17:42:15 -07:00
iio Staging: iio: adc: Update Kconfig entries adding module name information 2014-10-02 10:06:10 -07:00
imx-drm Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux 2014-10-14 09:39:08 +02:00
line6 staging: line6: fix midibuf.c coding style issue 2014-09-23 23:41:25 -07:00
lustre Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 2014-10-13 16:23:15 +02:00
media media updates for v3.18-rc1 2014-10-10 22:04:49 -04:00
mt29f_spinand staging/mt29f_spinand: coding style fixes 2014-08-16 12:23:27 -07:00
netlogic staging: netlogic: fix checkpatch.pl "LINE_SPACING" issuses 2014-09-08 14:02:13 -07:00
nvec
…
octeon staging: octeon: Combined seperate strings. 2014-10-02 09:59:20 -07:00
octeon-usb Staging: octeon-hcd: removed dummy label 2014-09-11 14:49:13 -07:00
olpc_dcon
…
ozwpan staging: ozwpan: Remove typedefs 2014-09-28 22:03:58 -04:00
panel
…
rtl8188eu staging: r8188eu: replace strnicmp with strncasecmp 2014-10-14 02:18:25 +02:00
rtl8192e staging: rtl8192e: use %*pEn to escape buffer 2014-10-14 02:18:27 +02:00
rtl8192u staging: rtl8192u: use %*pEn to escape buffer 2014-10-14 02:18:27 +02:00
rtl8712 staging: rtl8712: Fixed else not required after return 2014-10-02 11:59:40 -07:00
rtl8723au cfg80211: Convert del_station() callback to use a param struct 2014-10-20 16:24:21 +02:00
rts5208 staging: rts5208: remove unnecessary else 2014-10-02 10:07:04 -07:00
skein staging: skein: replace spaces with tabs 2014-09-19 17:27:28 -07:00
slicoss staging: slicoss: Fix void function return statements style warning 2014-09-28 23:36:24 -04:00
speakup staging: speakup: Fixed warning <linux/serial.h> instead of <asm/serial.h> 2014-10-02 10:09:01 -07:00
ste_rmi4 Staging: ste_rmi4: add new line after declarations 2014-09-23 13:44:11 -07:00
unisys staging: unisys: Fix CamelCase in uislib_force_channel_interrupt() 2014-10-02 09:49:29 -07:00
vme Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs 2014-10-13 11:28:42 +02:00
vt6655 staging: vt6655: Fixed C99 // comment errors in wpactl.c 2014-10-02 10:11:26 -07:00
vt6656 staging: vt6656: Merge three lines into one 2014-09-28 23:22:21 -04:00
wlan-ng staging: wlan-ng: use %*pEhp to print SN 2014-10-14 02:18:27 +02:00
xgifb staging: xgifb: remove unnecessary else 2014-09-06 21:48:19 -07:00
Kconfig staging: et131x: Remove et131x driver from drivers/staging 2014-10-03 13:55:14 -07:00
Makefile staging: et131x: Remove et131x driver from drivers/staging 2014-10-03 13:55:14 -07:00
staging.c
…