commit | 6db174eaada4c2c426eca689ea871d9c0546f7a9 | [log] [tgz] |
---|---|---|
author | Greg Kroah-Hartman <gregkh@suse.de> | Thu Dec 22 13:59:53 2011 -0800 |
committer | Greg Kroah-Hartman <gregkh@suse.de> | Thu Dec 22 13:59:59 2011 -0800 |
tree | 5cca48ecd33ac158bfb47ad44618e87060a78fe3 | |
parent | 06e298b46417bc729b996396a068daf462e2ab62 [diff] | |
parent | b0945c07d9110a5b97a5495e26accdbe1d0d9277 [diff] |
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