c8d1a12692
Conflicts: drivers/staging/arlan/arlan-main.c drivers/staging/comedi/drivers/cb_das16_cs.c drivers/staging/cx25821/cx25821-alsa.c drivers/staging/dt3155/dt3155_drv.c drivers/staging/hv/hv.c drivers/staging/netwave/netwave_cs.c drivers/staging/wavelan/wavelan.c drivers/staging/wavelan/wavelan_cs.c drivers/staging/wlags49_h2/wl_cs.c This required a bit of hand merging due to the conflicts that happened in the later .34-rc releases, as well as some staging driver changing coming in through other trees (v4l and pcmcia). Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |
||
|---|---|---|
| .. | ||
| 80211hdr.h | ||
| 80211mgr.c | ||
| 80211mgr.h | ||
| aes_ccmp.c | ||
| aes_ccmp.h | ||
| baseband.c | ||
| baseband.h | ||
| bssdb.c | ||
| bssdb.h | ||
| card.c | ||
| card.h | ||
| channel.c | ||
| channel.h | ||
| control.c | ||
| control.h | ||
| country.h | ||
| datarate.c | ||
| datarate.h | ||
| desc.h | ||
| device.h | ||
| device_cfg.h | ||
| dpc.c | ||
| dpc.h | ||
| firmware.c | ||
| firmware.h | ||
| hostap.c | ||
| hostap.h | ||
| int.c | ||
| int.h | ||
| iocmd.h | ||
| ioctl.c | ||
| ioctl.h | ||
| iowpa.h | ||
| iwctl.c | ||
| iwctl.h | ||
| Kconfig | ||
| key.c | ||
| key.h | ||
| mac.c | ||
| mac.h | ||
| main_usb.c | ||
| Makefile | ||
| mib.c | ||
| mib.h | ||
| michael.c | ||
| michael.h | ||
| power.c | ||
| power.h | ||
| rc4.c | ||
| rc4.h | ||
| rf.c | ||
| rf.h | ||
| rndis.h | ||
| rxtx.c | ||
| rxtx.h | ||
| srom.h | ||
| tcrc.c | ||
| tcrc.h | ||
| tether.c | ||
| tether.h | ||
| tkip.c | ||
| tkip.h | ||
| tmacro.h | ||
| TODO | ||
| ttype.h | ||
| upc.h | ||
| usbpipe.c | ||
| usbpipe.h | ||
| vntconfiguration.dat | ||
| wcmd.c | ||
| wcmd.h | ||
| wctl.c | ||
| wctl.h | ||
| wmgr.c | ||
| wmgr.h | ||
| wpa.c | ||
| wpa.h | ||
| wpa2.c | ||
| wpa2.h | ||
| wpactl.c | ||
| wpactl.h | ||