aboutsummaryrefslogtreecommitdiff
path: root/arch/m32r/opsput
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-01-22 13:14:16 -0800
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-01-22 13:14:16 -0800
commit39470bf24d93927bb27929b9f0d52ff5d608cfcb (patch)
tree36c5f47fbf29f58f96970083a7e0d44d34cdf81d /arch/m32r/opsput
parent2596627c5c30b45aa206b7b1b864bf00de3c3503 (diff)
parent39559b4ff89e390c42633d23d257e793a1177e03 (diff)
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6: USB: unusual_devs.h entry for nokia 6233 USB: Fix for typo in ohci-ep93xx.c USB: disable USB_MULTITHREAD_PROBE USB: add vendor/device id for Option GT Max 3.6 cards USB: unusual_devs.h for 0x046b:ff40 USB: make usbhid ignore Imation Disc Stakka USB: rndis_host: fix crash while probing a Nokia S60 mobile USB: asix: Detect internal PHY and enable/use accordingly usbtouchscreen: make ITM screens report BTN_TOUCH as zero when not touched
Diffstat (limited to 'arch/m32r/opsput')
0 files changed, 0 insertions, 0 deletions