alistair23-linux/drivers/staging/rtl8187se
Greg Kroah-Hartman 17cb3be61b Merge branch 'staging-linus' into staging-next
This is to get the comedi fixes, and resolve the issue in comdi_test.c
and comedi_fops.c that were caused by changes in both branches.

It also allows the fwserial driver changes to be applied, as they
required the fixes that are in staging-linus.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-01-07 15:17:52 -08:00
..
ieee80211 staging/rtl8187se: Fix spacing coding style in ieee80211/dot11d.c 2013-01-07 12:48:20 -08:00
Kconfig
Makefile
r8180.h staging: rtl8187se: Removed empty stub read_acadapter_file() 2012-11-13 12:41:59 -08:00
r8180_93cx6.h
r8180_core.c staging: rtl8187se: Fix failure to check pci_map_single() 2013-01-07 12:57:27 -08:00
r8180_dm.c
r8180_dm.h staging/rtl8187se: Fix spacing coding style in r8180_dm.h 2012-11-21 13:59:58 -08:00
r8180_hw.h
r8180_rtl8225.h staging: rtl8187se: Removed unused parameters of HwHSSIThreeWire() 2012-11-13 12:41:58 -08:00
r8180_rtl8225z2.c staging: rtl8187se: Use ARRAY_SIZE instead of in-code constants 2012-11-13 12:41:58 -08:00
r8180_wx.c Staging: rtl8187se: remove check for IW_ENCODE_DISABLED 2012-11-21 14:00:01 -08:00
r8180_wx.h
r8185b_init.c staging/rtl8187se: Fix spacing coding style in r8185b_init.c 2012-11-21 14:00:00 -08:00
TODO