Merge 3.0-rc2 into usb-linus as it's needed by some USB patches

Signed-off-by: Greg Kroah-Hartman <[email protected]>

diff --cc Documentation/kernel-parameters.txt
Simple merge

diff --cc drivers/usb/gadget/Kconfig
Simple merge

diff --cc drivers/usb/host/xhci-dbg.c
Simple merge

diff --cc drivers/usb/host/xhci-mem.c
Simple merge

diff --cc drivers/usb/host/xhci-ring.c
Simple merge

diff --cc drivers/usb/host/xhci.c
Simple merge

diff --cc drivers/usb/host/xhci.h
Simple merge

diff --cc drivers/usb/renesas_usbhs/mod_gadget.c
Simple merge