George Kadianakis df574b8ecf Staging: fix rtl8187se compilation errors with mac80211 ... This patch fixes compilation problems that were caused by function naming conflicts between the rtl8187se driver and the mac80211 stack. Signed-off-by: George Kadianakis <desnacked at gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>		2009-12-23 11:27:46 -08:00
..
accessibility	drop explicit include of autoconf.h	2009-12-12 13:08:15 +01:00
acpi	Merge branch 'misc-2.6.33' into release	2009-12-16 14:22:32 -05:00
amba
ata	pata_bf54x: handle portmuxing of pins through GPIO PORTs	2009-12-21 13:55:38 -05:00
atm	drivers/atm: Correct code taking the size of a pointer	2009-12-13 19:56:33 -08:00
auxdisplay
base	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6	2009-12-22 14:22:05 -08:00
block	Merge branch 'for-2.6.33' of git://git.kernel.dk/linux-2.6-block	2009-12-15 09:11:28 -08:00
bluetooth	Bluetooth: Prevent ill-timed autosuspend in USB driver	2009-12-17 12:12:49 -08:00
cdrom
char	kfifo: fix warn_unused_result	2009-12-22 14:17:56 -08:00
clocksource	cs5535: add a generic clock event MFGPT driver	2009-12-15 08:53:28 -08:00
connector
cpufreq	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu	2009-12-14 09:58:24 -08:00
cpuidle	drivers/cpuidle: Move dereference after NULL test	2009-12-15 08:53:25 -08:00
crypto	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu	2009-12-14 09:58:24 -08:00
dca
dio
dma	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx	2009-12-16 10:28:56 -08:00
edac	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp	2009-12-16 10:09:43 -08:00
eisa
firewire	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6	2009-12-11 15:22:27 -08:00
firmware	firmware: only allow EDD on x86	2009-12-15 08:53:34 -08:00
gpio	gpiolib: add support for changing value polarity in sysfs	2009-12-16 07:20:01 -08:00
gpu	Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6	2009-12-23 08:59:32 -08:00
hid	drop explicit include of autoconf.h	2009-12-12 13:08:15 +01:00
hwmon	Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging	2009-12-17 16:48:08 -08:00
i2c	const: constify remaining dev_pm_ops	2009-12-15 08:53:25 -08:00
ide	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc	2009-12-12 14:27:24 -08:00
idle	cpumask: convert drivers/idle/i7300_idle.c to cpumask_var_t	2009-12-17 11:43:25 +10:30
ieee1394
ieee802154
infiniband	kfifo: fix warn_unused_result	2009-12-22 14:17:56 -08:00
input	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input	2009-12-16 10:31:44 -08:00
isdn	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6	2009-12-21 10:12:25 -08:00
leds	leds: leds-pwm: Set led_classdev max_brightness	2009-12-17 11:42:34 +00:00
lguest	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu	2009-12-14 09:58:24 -08:00
macintosh	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc	2009-12-12 14:27:24 -08:00
mca
md	Merge git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-2.6-dm	2009-12-15 09:12:01 -08:00
media	media video cx23888 driver: ported to new kfifo API	2009-12-22 14:17:57 -08:00
memstick
message	[SCSI] mpt fusion: Fix 32 bit platforms with 64 bit resources.	2009-12-10 09:45:14 -06:00
mfd	mfd: compile fix for twl4030 renaming	2009-12-15 09:33:36 -08:00
misc	Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6	2009-12-17 16:38:48 -08:00
mmc	sdhci-of: add support for the wii sdhci controller	2009-12-17 15:45:32 -08:00
mtd	Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus	2009-12-17 16:38:06 -08:00
net	kfifo: fix warn_unused_result	2009-12-22 14:17:56 -08:00
nubus
of
oprofile	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu	2009-12-14 09:58:24 -08:00
parisc	parisc: Fixup last users of irq_chip->typename	2009-12-16 03:48:56 +00:00
parport	parport_pc.c: use correct length in strncmp	2009-12-16 07:20:12 -08:00
pci	Merge git://git.infradead.org/iommu-2.6	2009-12-16 10:11:38 -08:00
pcmcia	PCMCIA: fix pxa2xx_lubbock modular build error	2009-12-16 20:11:02 +00:00
platform	kfifo: rename kfifo_put... into kfifo_in... and kfifo_get... into kfifo_out...	2009-12-22 14:17:56 -08:00
pnp	Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6	2009-12-16 12:33:19 -08:00
power	Merge git://git.infradead.org/battery-2.6	2009-12-15 08:59:33 -08:00
pps
ps3
rapidio
regulator	regulator: wm831x_reg_read() failure unnoticed in wm831x_aldo_get_mode()	2009-12-17 10:27:30 +00:00
rtc	Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus	2009-12-17 16:38:06 -08:00
s390	[S390] Use strim instead of strstrip to avoid false warnings.	2009-12-18 17:43:33 +01:00
sbus
scsi	kfifo: fix warn_unused_result	2009-12-22 14:17:56 -08:00
serial	Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6	2009-12-16 10:29:52 -08:00
sfi
sh
sn	ioc3/ioc4: fix error path on driver registration	2009-12-15 08:53:27 -08:00
spi	Merge branch 'next-spi' of git://git.secretlab.ca/git/linux-2.6	2009-12-17 15:59:05 -08:00
ssb
staging	Staging: fix rtl8187se compilation errors with mac80211	2009-12-23 11:27:46 -08:00
tc
telephony
thermal	Merge branch 'misc-2.6.33' into release	2009-12-16 14:22:32 -05:00
uio	const: constify remaining dev_pm_ops	2009-12-15 08:53:25 -08:00
usb	Fix usb_serial_probe() problem introduced by the recent kfifo changes	2009-12-23 08:53:31 -08:00
uwb
video	Merge branch 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6	2009-12-17 16:57:49 -08:00
virtio
vlynq
w1
watchdog	watchdog: update geodewdt for new MFGPT API	2009-12-18 10:19:57 -08:00
xen	Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6	2009-12-11 12:18:16 -08:00
zorro
Kconfig	cs5535: add a generic clock event MFGPT driver	2009-12-15 08:53:28 -08:00
Makefile