John W. Linville 8e00f5fbb4 Merge branch 'master' of git://git.infradead.org/users/linville/wireless-next into for-davem ... Conflicts: drivers/net/wireless/iwlwifi/iwl-pci.c drivers/net/wireless/wl12xx/main.c		2011-09-30 14:52:29 -04:00
..
acpi
asm-generic	All Arch: remove linkage for sys_nfsservctl system call	2011-08-26 15:09:58 -07:00
crypto
drm
keys
linux	Merge branch 'master' of git://git.infradead.org/users/linville/wireless-next into for-davem	2011-09-30 14:52:29 -04:00
math-emu
media
mtd
net	Merge branch 'master' of git://git.infradead.org/users/linville/wireless-next into for-davem	2011-09-30 14:52:29 -04:00
pcmcia
rdma	net: consolidate and fix ethtool_ops->get_settings calling	2011-09-15 17:32:26 -04:00
rxrpc
scsi
sound
target	target: Make standard INQUIRY return 'not connected' for tpg_virt_lun0	2011-08-22 19:25:35 +00:00
trace	Merge branch 'for-linus' of git://git.kernel.dk/linux-block	2011-08-19 10:47:07 -07:00
video
xen
Kbuild