From: Greg Kroah-Hartman Date: Mon, 25 Jun 2012 16:11:02 +0000 (-0700) Subject: Merge 3.5-rc4 into usb-linus X-Git-Tag: v3.5-rc5~18^2~3 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=8f8741ca5e55a35dafa35f4eac2b70b08fae997e;p=users%2Fdwmw2%2Flinux.git Merge 3.5-rc4 into usb-linus This is needed to sync up with the previous USB changes that were merged in Linus's branch. Signed-off-by: Greg Kroah-Hartman --- 8f8741ca5e55a35dafa35f4eac2b70b08fae997e