David S. Miller 6373464288 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 ... Conflicts: drivers/net/wireless/iwlwifi/iwl-core.h		2010-01-19 11:43:42 -08:00
..
ieee80211	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6	2010-01-19 11:43:42 -08:00
Kconfig	Staging: rtl8187se: Rename staging driver to avoid name conflict with mainline driver	2009-12-11 12:23:20 -08:00
Makefile	Staging: rtl8187se: Rename staging driver to avoid name conflict with mainline driver	2009-12-11 12:23:20 -08:00
TODO	Staging: update TODO files	2009-11-30 16:39:42 -08:00
r8180.h	Staging: rtl8187se: Remove card_type	2009-12-11 12:23:20 -08:00
r8180_93cx6.c	Staging: add rtl8187se driver	2009-01-06 13:52:31 -08:00
r8180_93cx6.h	Staging: rtl8187se: remove CONFIG_RTL8185B ifdefs	2009-09-15 12:01:29 -07:00
r8180_core.c	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6	2010-01-19 11:43:42 -08:00
r8180_dm.c	Staging: rtl8187se: Remove card8185 variable to simplify flow	2009-12-11 12:23:20 -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: Remove card_type	2009-12-11 12:23:20 -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: rtl8187se: Remove card8185 variable to simplify flow	2009-12-11 12:23:20 -08:00