John W. Linville d859898114 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 ... Conflicts: drivers/net/wireless/ath/ath5k/sysfs.c net/bluetooth/l2cap_core.c net/mac80211/wpa.c		2011-07-11 14:46:59 -04:00
..
accessibility
acpi
amba
ata
atm
auxdisplay
base
bcma	bcma: detect PCI core working in hostmode	2011-07-07 13:13:34 -04:00
block
bluetooth
cdrom
char
clk
clocksource
connector
cpufreq
cpuidle
crypto
dca
dio
dma
edac
eisa
firewire
firmware
gpio
gpu
hid
hwmon
hwspinlock
i2c
ide
idle
ieee802154
infiniband
input
isdn
leds
lguest
macintosh
mca
md
media
memstick
message
mfd
misc
mmc
mtd
net	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6	2011-07-11 14:46:59 -04:00
nfc	NFC: pn533: add NXP pn533 nfc device driver	2011-07-05 15:26:58 -04:00
nubus
of
oprofile
parisc
parport
pci
pcmcia
platform
pnp
power
pps
ps3
rapidio
regulator
rtc
s390
sbus
scsi
sfi
sh
sn
spi
ssb	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6	2011-07-11 14:46:59 -04:00
staging
target
tc
telephony
thermal
tty
uio
usb
uwb
vhost
video
virtio
vlynq
w1
watchdog
xen
zorro
Kconfig	NFC: add nfc subsystem core	2011-07-05 15:26:57 -04:00
Makefile	NFC: add nfc subsystem core	2011-07-05 15:26:57 -04:00