diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-07-21 16:34:47 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-07-21 16:34:47 +1000 |
| commit | b406489255aba819f63f83c5fb7d8d396384c950 (patch) | |
| tree | 97d1e6fab96d06e4cc5f80fa73b79f981e04e379 /MAINTAINERS | |
| parent | 4d594c1b504a45cd867d00b35e2572e719a0c46c (diff) | |
| parent | 8346b33fad01cfe93f0fd0e64cd32ff40bd4ba41 (diff) | |
Merge remote-tracking branch 'usb-gadget/next'
Conflicts:
drivers/usb/musb/musb_core.c
drivers/usb/musb/musb_cppi41.c
drivers/usb/musb/musb_host.c
include/uapi/linux/usb/functionfs.h
Diffstat (limited to 'MAINTAINERS')
0 files changed, 0 insertions, 0 deletions