From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Wed, 28 Aug 2013 22:30:03 +0000 (-0700)
Subject: Merge tag 'for-usb-next-2013-08-27-15-07' of git://git.kernel.org/pub/scm/linux/kerne... 
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=ff49896aa45de286f3cbfda800fc92665374546a;p=deliverable%2Flinux.git

Merge tag 'for-usb-next-2013-08-27-15-07' of git://git./linux/kernel/git/sarah/xhci into usb-next

Sarah writes:

xhci: Fix build breakage and new warnings.

Hi Greg,

This first patch should fix the build breakage Sedat Dilek reported.
Apologizes for not including this patch before commit
0730d52a86919300a39a2be37f6c140997dfb82f "xhci:prevent "callbacks suppressed"
when debug is not enabled"

The second patch fixes a new build warning introduced by commit
c8476fb855434c733099079063990e5bfa7ecad6 "usb: xhci: Disable runtime PM suspend
for quirky controllers", which was caught by the 0day build system.

Sarah Sharp
---

ff49896aa45de286f3cbfda800fc92665374546a