Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6
Showing
- Documentation/DocBook/usb.tmpl 1 addition, 1 deletionDocumentation/DocBook/usb.tmpl
- Documentation/input/yealink.txt 16 additions, 3 deletionsDocumentation/input/yealink.txt
- Documentation/kernel-parameters.txt 0 additions, 2 deletionsDocumentation/kernel-parameters.txt
- MAINTAINERS 6 additions, 14 deletionsMAINTAINERS
- drivers/Makefile 1 addition, 1 deletiondrivers/Makefile
- drivers/base/power/main.c 3 additions, 23 deletionsdrivers/base/power/main.c
- drivers/base/power/power.h 0 additions, 13 deletionsdrivers/base/power/power.h
- drivers/base/power/runtime.c 1 addition, 0 deletionsdrivers/base/power/runtime.c
- drivers/block/ub.c 2 additions, 2 deletionsdrivers/block/ub.c
- drivers/pci/quirks.c 3 additions, 250 deletionsdrivers/pci/quirks.c
- drivers/usb/Makefile 1 addition, 1 deletiondrivers/usb/Makefile
- drivers/usb/class/Kconfig 0 additions, 23 deletionsdrivers/usb/class/Kconfig
- drivers/usb/class/Makefile 0 additions, 1 deletiondrivers/usb/class/Makefile
- drivers/usb/class/bluetty.c 0 additions, 1279 deletionsdrivers/usb/class/bluetty.c
- drivers/usb/class/cdc-acm.c 2 additions, 3 deletionsdrivers/usb/class/cdc-acm.c
- drivers/usb/class/usblp.c 1 addition, 2 deletionsdrivers/usb/class/usblp.c
- drivers/usb/core/Kconfig 7 additions, 4 deletionsdrivers/usb/core/Kconfig
- drivers/usb/core/Makefile 1 addition, 1 deletiondrivers/usb/core/Makefile
- drivers/usb/core/config.c 10 additions, 12 deletionsdrivers/usb/core/config.c
- drivers/usb/core/devio.c 145 additions, 45 deletionsdrivers/usb/core/devio.c
Loading
Please register or sign in to comment