Larry Finger b6b1ac6937 Staging: r8187se: Fix compile error from wireless-testing commit 7044cc56 ... In wireless-testing, commit 7044cc56 added struct ieee80211_hdr_3addr to include/linux/ieee80211.h. This definition collides with one that is in the r8187se driver in staging. The conflict is resolved by changing r8187se to use the definition from include/linuc/ieee80211.h. Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>		2010-01-14 18:16:57 -05:00
..
altpciechdma	Staging: altpciechdma: 64bit type warning fix	2009-09-15 12:02:26 -07:00
android	Staging: android: mark subsystem as broken	2009-10-30 14:47:44 -07:00
arlan	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2009-12-08 07:55:01 -08:00
asus_oled	Staging: asus_oled: Cleaned up checkpatch issues.	2009-09-15 12:02:33 -07:00
b3dfg	Staging: b3dfg: fix sched.h build breakage	2009-10-14 14:14:36 -07:00
comedi	pcmcia: rework the irq_req_t typedef	2009-11-28 18:03:14 +01:00
cx25821	V4L/DVB (12851): cx25821/Makefile: Cleanup	2009-09-19 00:13:35 -03:00
dream	Staging: dream: introduce missing kfree	2009-09-15 12:02:34 -07:00
dst	Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block	2009-10-04 12:39:14 -07:00
echo	Staging: echo: coding style cleanups	2009-09-15 12:02:16 -07:00
et131x	Staging: et131x: Fix the add_10bit macro	2009-10-14 14:14:39 -07:00
frontier	Staging: remove unused #include <linux/version.h>'s	2009-06-19 11:00:36 -07:00
go7007	V4L/DVB (13372): staging/go7007: fix mutex function usage for s2250	2009-11-30 17:49:15 -02:00
hv	Staging: hv: Fix some missing author names	2009-11-30 16:39:35 -08:00
iio	staging: Complete sched.h removal from interrupt.h	2009-10-14 14:14:37 -07:00
line6	Staging: line6: ffzb returns an unsigned integer	2009-09-15 12:02:34 -07:00
mimio
netwave	Merge branch 'master' of /home/davem/src/GIT/linux-2.6/	2009-12-05 15:22:26 -08:00
octeon	Staging: octeon-ethernet: Assign proper MAC addresses.	2009-11-23 18:55:34 +00:00
otus	Staging: wireless drivers Kconfig change	2009-10-30 14:47:44 -07:00
p9auth	Staging: p9auth: a few fixes	2009-10-09 13:47:24 -07:00
panel	Staging: Panel: prevent driver from calling misc_deregister twice on same ressource	2009-10-30 14:47:43 -07:00
phison
poch	Staging: poch: fix sched.h build breakage	2009-10-14 14:14:36 -07:00
pohmelfs	writeback: remove unused nonblocking and congestion checks	2009-12-03 13:54:25 +01:00
quatech_usb2	Staging: quatech_usb2: Improvements to set_termios method	2009-09-15 12:01:36 -07:00
rar	Staging: rar/sep: Don't use random VENDOR_ID macros but the proper names	2009-09-15 12:02:12 -07:00
rt2860	Staging: wireless drivers Kconfig change	2009-10-30 14:47:44 -07:00
rt2870	Staging: wireless drivers Kconfig change	2009-10-30 14:47:44 -07:00
rt3070	Staging: remove no longer needed rt3070 driver	2009-09-15 12:02:23 -07:00
rt3090	Staging: wireless drivers Kconfig change	2009-10-30 14:47:44 -07:00
rtl8187se	Staging: r8187se: Fix compile error from wireless-testing commit 7044cc56	2010-01-14 18:16:57 -05:00
rtl8192e	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2009-11-18 22:19:03 -08:00
rtl8192su	Staging: update TODO files	2009-11-30 16:39:42 -08:00
sep	staging: Complete sched.h removal from interrupt.h	2009-10-14 14:14:37 -07:00
serqt_usb2	Staging: serqt_usb2: fix qt_open parameters	2009-09-15 12:02:06 -07:00
slicoss	Staging: ARRAY_SIZE changes	2009-09-15 12:02:06 -07:00
strip	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6	2009-11-09 11:17:24 -08:00
udlfb	Staging: udlfb: fix printk format warning	2009-09-15 12:02:06 -07:00
usbip	Staging: usb-ip: vhci_hdc:Fix the returned error value	2009-09-15 12:02:05 -07:00
vme	Staging: vme: fix sched.h build breakage	2009-10-14 14:14:36 -07:00
vt6655	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2009-12-01 22:13:38 -08:00
vt6656	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2009-12-01 22:13:38 -08:00
wavelan	Merge branch 'master' of /home/davem/src/GIT/linux-2.6/	2009-12-05 15:22:26 -08:00
winbond	Staging: wireless drivers Kconfig change	2009-10-30 14:47:44 -07:00
wlan-ng	Staging: wireless drivers Kconfig change	2009-10-30 14:47:44 -07:00
Kconfig	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2009-11-18 22:19:03 -08:00
Makefile	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2009-11-18 22:19:03 -08:00
staging.c