Larry Finger
fa7ccfb170
rtlwifi: rtl8192se: Handle duplicate PCI ID 0x10ec:0x8192 conflict with r8192e_pci
...
There are two devices with PCI ID 0x10ec:0x8192, namely RTL8192E and
RTL8192SE. The method of distinguishing them is by the revision ID
at offset 0x8 of the PCI configuration space. If the value is 0x10,
then the device uses rtl8192se for a driver.
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
2011-06-20 14:56:56 -04:00
..
accessibility
acpi
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2011-05-23 09:12:26 -07:00
amba
ata
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev
2011-05-20 14:31:27 -07:00
atm
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6
2011-05-20 13:43:21 -07:00
auxdisplay
base
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2011-05-23 09:12:26 -07:00
bcma
bcma: add PCI ID of the card found in Thinkpad X120e
2011-05-16 14:25:29 -04:00
block
Add appropriate <linux/prefetch.h> include for prefetch users
2011-05-22 21:41:57 -07:00
bluetooth
Bluetooth: Do not ignore errors returned from strict_strtol()
2011-06-10 15:04:41 -03:00
cdrom
char
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm
2011-05-23 09:08:19 -07:00
clk
clocksource
Merge branch 'consolidate-clksrc-i8253' of master.kernel.org:~rmk/linux-2.6-arm into timers/clocksource
2011-05-14 12:06:36 +02:00
connector
cpufreq
Merge branch 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
2011-05-19 17:55:12 -07:00
cpuidle
crypto
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
2011-05-20 17:24:14 -07:00
dca
dio
dma
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2011-05-23 09:12:26 -07:00
edac
drivercore: revert addition of of_match to struct device
2011-05-18 12:32:23 -06:00
eisa
firewire
firewire: sbp2: parallelize login, reconnect, logout
2011-05-10 22:53:46 +02:00
firmware
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2011-05-23 09:12:26 -07:00
gpio
gpu
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2011-05-23 09:12:26 -07:00
hid
Merge branches 'doc', 'multitouch', 'upstream' and 'upstream-fixes' into for-linus
2011-05-23 12:49:25 +02:00
hwmon
hwmon: (coretemp) Fix checkpatch errors
2011-05-21 07:29:17 -07:00
hwspinlock
i2c
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2011-05-23 09:12:26 -07:00
ide
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6
2011-05-22 22:08:32 -07:00
idle
ieee802154
infiniband
Add appropriate <linux/prefetch.h> include for prefetch users
2011-05-22 21:41:57 -07:00
input
input/atari: Fix mouse movement and button mapping
2011-05-19 18:19:12 +02:00
isdn
isdn: netjet - blacklist Digium TDM400P
2011-05-25 17:55:32 -04:00
leds
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2011-05-23 09:12:26 -07:00
lguest
macintosh
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2011-05-23 09:12:26 -07:00
mca
md
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2011-05-23 09:12:26 -07:00
media
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2011-05-23 09:12:26 -07:00
memstick
message
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2011-05-23 09:12:26 -07:00
mfd
mfd: Fix for the TWL4030 PM sleep/wakeup sequence
2011-05-11 11:09:58 +02:00
misc
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2011-05-23 09:12:26 -07:00
mmc
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2011-05-23 09:12:26 -07:00
mtd
MIPS: Alchemy: Clean up GPIO registers and accessors
2011-05-19 09:55:46 +01:00
net
rtlwifi: rtl8192se: Handle duplicate PCI ID 0x10ec:0x8192 conflict with r8192e_pci
2011-06-20 14:56:56 -04:00
nfc
nubus
of
oprofile
parisc
parport
pci
Merge branch 'core-iommu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
2011-05-19 17:28:58 -07:00
pcmcia
platform
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2011-05-23 09:12:26 -07:00
pnp
power
pps
ps3
rapidio
rapidio: fix default routing initialization
2011-05-18 02:55:22 -07:00
regulator
rtc
Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
2011-05-19 17:45:08 -07:00
s390
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6
2011-05-20 13:43:21 -07:00
sbus
scsi
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2011-05-23 09:12:26 -07:00
sfi
sh
sn
spi
Haavard Skinnemoen has left Atmel
2011-05-18 23:24:50 +02:00
ssb
ssb: fix PCI(e) driver regression causing oops on PCI cards
2011-06-03 14:19:49 -04:00
staging
Merge branch 'for-davem' of ssh://master.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
2011-05-25 13:28:55 -04:00
target
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2011-05-23 09:12:26 -07:00
tc
telephony
thermal
tty
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2011-05-23 09:12:26 -07:00
uio
usb
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2011-05-23 09:12:26 -07:00
uwb
vhost
video
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2011-05-23 09:12:26 -07:00
virtio
vlynq
w1
watchdog
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2011-05-23 09:12:26 -07:00
xen
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2011-05-23 09:12:26 -07:00
zorro
Kconfig
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6
2011-05-20 13:43:21 -07:00
Makefile
bcma: add Broadcom specific AMBA bus driver
2011-05-10 15:54:54 -04:00