Merge branch 'for-greg' of git://gitorious.org/usb/usb into usb-linus
authorGreg Kroah-Hartman <gregkh@suse.de>
Thu, 17 Feb 2011 22:09:43 +0000 (14:09 -0800)
committerGreg Kroah-Hartman <gregkh@suse.de>
Thu, 17 Feb 2011 22:09:51 +0000 (14:09 -0800)
* 'for-greg' of git://gitorious.org/usb/usb:
  usb: musb: omap2430: fix kernel panic on reboot
  usb: musb: fix build breakage


Trivial merge