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> |
||
|---|---|---|
| .. | ||
| ieee80211 | ||
| authors | ||
| Kconfig | ||
| Makefile | ||
| r819xU_cmdpkt.c | ||
| r819xU_cmdpkt.h | ||
| r819xU_HTGen.h | ||
| r819xU_HTType.h | ||
| r8192S_Efuse.c | ||
| r8192S_Efuse.h | ||
| r8192S_firmware.c | ||
| r8192S_firmware.h | ||
| r8192S_hw.h | ||
| r8192S_phy.c | ||
| r8192S_phy.h | ||
| r8192S_phyreg.h | ||
| r8192S_rtl6052.c | ||
| r8192S_rtl6052.h | ||
| r8192S_rtl8225.c | ||
| r8192S_rtl8225.h | ||
| r8192SU_HWImg.c | ||
| r8192SU_HWImg.h | ||
| r8192SU_led.c | ||
| r8192SU_led.h | ||
| r8192U_core.c | ||
| r8192U_dm.c | ||
| r8192U_dm.h | ||
| r8192U_pm.c | ||
| r8192U_pm.h | ||
| r8192U_wx.c | ||
| r8192U_wx.h | ||
| r8192U.h | ||
| TODO | ||