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

Browse source

* 'for-next/musb' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb:
  usb: musb: omap2430: fix compile warning
  usb: musb: fix pm_runtime calls while atomic
  usb: musb: drop ARCH dependency
  usb: musb: headers cleanup
  usb: musb: allow building USB_MUSB_TUSB6010 as a module
  usb: musb: use a Kconfig choice to pick the right DMA method
  usb: musb: omap2+: save and restore OTG_INTERFSEL
  usb: musb: omap2+: fix context api's
  usb: musb: ux500: optimize DMA callback routine

...

This commit is contained in:

Greg Kroah-Hartman 2011-12-12 15:51:41 -08:00

parent 007d00d4c1 e7f4e73287

commit a1016ce33c

12 changed files with 70 additions and 103 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

2

arch/arm/mach-omap2/board-n8x0.c

View file

59

drivers/usb/musb/Kconfig

View file

26

drivers/usb/musb/Makefile

View file

5

drivers/usb/musb/musb_core.c

View file

4

drivers/usb/musb/musb_core.h

View file

8

drivers/usb/musb/musb_debugfs.c

View file

2

drivers/usb/musb/musb_gadget.c

View file

1

drivers/usb/musb/musb_gadget_ep0.c

View file

2

drivers/usb/musb/musb_io.h

View file

24

drivers/usb/musb/omap2430.c

View file

1

drivers/usb/musb/tusb6010.c

View file

39

drivers/usb/musb/ux500_dma.c

View file