Greg Kroah-Hartman f341dddf1d Staging: merge staging patches into Linus's main branch ... There were a number of patches that went into Linus's tree already that conflicted with other changes in the staging branch. This merge resolves those merge conflicts. Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>		2010-03-04 08:39:02 -08:00
..
ieee80211	Staging: merge staging patches into Linus's main branch	2010-03-04 08:39:02 -08:00
Kconfig	staging: r8187se: Change to use common eeprom routines in EEPROM_93CX	2010-03-03 16:42:57 -08:00
Makefile	staging: r8187se: Change to use common eeprom routines in EEPROM_93CX	2010-03-03 16:42:57 -08:00
r8180.h	Staging: r8187se: Remove two private variables that have a fixed value	2010-03-03 16:42:59 -08:00
r8180_93cx6.h	staging: r8187se: Change to use common eeprom routines in EEPROM_93CX	2010-03-03 16:42:57 -08:00
r8180_core.c	Staging: merge staging patches into Linus's main branch	2010-03-04 08:39:02 -08:00
r8180_dm.c	Staging: r8187se: Remove two private variables that have a fixed value	2010-03-03 16:42:59 -08:00
r8180_dm.h	Staging: rtl8187se: remove kernel version compatibility wrappers	2009-09-15 12:01:27 -07:00
r8180_hw.h	Staging: rtl8187se: remove unused definitions from r8180_hw.h	2009-09-15 12:01:31 -07:00
r8180_rtl8225.h	Staging: rtl8187se: merge r8180_rtl8225.c with r8180_rtl8225z2.c	2009-09-15 12:01:31 -07:00
r8180_rtl8225z2.c	Staging: r8187se: Remove two private variables that have a fixed value	2010-03-03 16:42:59 -08:00
r8180_wx.c	Staging: fix rtl8187se compilation errors with mac80211	2009-12-23 11:27:46 -08:00
r8180_wx.h	Staging: rtl8187se: remove duplicate dot11d.h and ieee80211.h includes	2009-09-15 12:01:27 -07:00
r8185b_init.c	Staging: r8187se: Remove dead code from r8185b_init.c	2010-03-03 16:42:59 -08:00
TODO	staging: r8187se: Change to use common eeprom routines in EEPROM_93CX	2010-03-03 16:42:57 -08:00