diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-03-15 18:14:53 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-03-15 18:14:53 +1100 |
| commit | 3bd35fd6342b1d0bd20cd0d8028e95f8dd740ffb (patch) | |
| tree | 0aab2eefdd5c14f385a891b7a6f0067d2404cddb /MAINTAINERS | |
| parent | 463a5c92d3ed3035d2e091ddb250c6ccf515317d (diff) | |
| parent | 500132a0f26ad7d9916102193cbc6c1b1becb373 (diff) | |
Merge remote-tracking branch 'usb/usb-next'
Conflicts:
arch/arm/mach-omap2/board-omap3evm.c
arch/arm/mach-omap2/board-overo.c
arch/arm/mach-omap2/clock3xxx_data.c
arch/arm/mach-omap2/usb-musb.c
arch/arm/plat-omap/include/plat/usb.h
drivers/usb/gadget/Kconfig
drivers/usb/gadget/fsl_mxc_udc.c
drivers/usb/musb/musb_core.h
Diffstat (limited to 'MAINTAINERS')
0 files changed, 0 insertions, 0 deletions