From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Thu, 22 Dec 2011 21:59:53 +0000 (-0800)
Subject: Merge branch 'for-next/musb' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi... 
X-Git-Tag: v3.3-rc1~153^2~26
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=6db174eaada4c2c426eca689ea871d9c0546f7a9;p=users%2Fwilly%2Flinux.git

Merge branch 'for-next/musb' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-next

* 'for-next/musb' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb:
  usb: musb: remove extern qualifier from musb_debug.h header
  usb: musb: cleanup kconfig
  usb: musb: trivial Kconfig cleanups
  musb: omap2430: avoid pm_runtime_disable()
  usb: musb: remove a bit of indentation
  usb: musb: trivial cleanup
  usb: musb: fix pm_runtime mismatch
---

6db174eaada4c2c426eca689ea871d9c0546f7a9