Greg Kroah-Hartman e9563355ac Staging: Merge staging-next into Linus's tree ...

Conflicts:
	drivers/staging/Kconfig
	drivers/staging/batman-adv/bat_sysfs.c
	drivers/staging/batman-adv/device.c
	drivers/staging/batman-adv/hard-interface.c
	drivers/staging/cx25821/cx25821-audups11.c

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

2010-08-05 14:18:03 -07:00

..

ieee80211

Staging: Use kmemdup

2010-05-17 16:31:15 -07:00

Kconfig

Staging: rtl81xx: Fix build problems when CONFIG_CRYPTO=n

2010-06-18 16:41:50 -07:00

Makefile

staging: r8187se: Change to use common eeprom routines in EEPROM_93CX

2010-03-03 16:42:57 -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: rtl8187se: Fix compile warnings in 2.6.35-rc2

2010-06-30 08:18:15 -07: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: rtl8187se: fixed checkpatch.pl warnings and errors in r8180_rtl8225z2.c

2010-05-11 11:35:54 -07: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

r8180.h

Staging: r8187se: Remove two private variables that have a fixed value

2010-03-03 16:42:59 -08: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