Merge Linus's tree into staging-next
authorGreg Kroah-Hartman <gregkh@suse.de>
Thu, 9 Jun 2011 20:49:02 +0000 (13:49 -0700)
committerGreg Kroah-Hartman <gregkh@suse.de>
Thu, 9 Jun 2011 20:49:02 +0000 (13:49 -0700)
This was done to resolve the conflicts that were in a number of files
due to changes done upstream with others done in the staging-next
branch.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
1  2 
MAINTAINERS
drivers/staging/brcm80211/brcmfmac/wl_iw.c
drivers/staging/usbip/stub_rx.c

diff --cc MAINTAINERS
Simple merge
Simple merge