Greg Kroah-Hartman 6eafa4604c Merge 3.1-rc4 into staging-next ... This resolves a conflict with: drivers/staging/brcm80211/brcmsmac/types.h Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>		2011-08-29 08:47:46 -07: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 3.1-rc4 into staging-next	2011-08-29 08:47:46 -07:00
math-emu
media
mtd
net
pcmcia
rdma
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