]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 6 Jul 2011 03:57:45 +0000 (20:57 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 6 Jul 2011 03:57:45 +0000 (20:57 -0700)
* 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6:
  USB: fix regression occurring during device removal
  USB: fsl_udc_core: fix build breakage when building for ARM arch


Trivial merge