From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 25 Feb 2011 19:14:44 +0000 (-0800)
Subject: Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh... 
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=c1bc3beb0663b4aee97914293b2b4d41ac3a909c;p=linux-beck.git

Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6

* 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6:
  usb: musb: core: set has_tt flag
  USB: xhci: mark local functions as static
  USB: xhci: fix couple sparse annotations
  USB: xhci: rework xhci_print_ir_set() to get ir set from xhci itself
  USB: Reset USB 3.0 devices on (re)discovery
  xhci: Fix an error in count_sg_trbs_needed()
  xhci: Fix errors in the running total calculations in the TRB math
  xhci: Clarify some expressions in the TRB math
  xhci: Avoid BUG() in interrupt context
---

c1bc3beb0663b4aee97914293b2b4d41ac3a909c