diff options
| author | Linus Torvalds <torvalds@woody.osdl.org> | 2006-11-16 16:39:46 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-11-16 16:39:46 -0800 |
| commit | 0e12c5e85e6fe0a247d547a28a1884915cd3f5b9 (patch) | |
| tree | 63747b26416733e37ed9079891ab9c31ceca7bc3 /sound/oss/pas2_pcm.c | |
| parent | ccf9ff524ccb195d648ecb0b168340560b42532c (diff) | |
| parent | 5a3fcf5c7f035de8e2b28d144d67b7bebac8a723 (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: auerswald possible memleak fix
USB: ipaq: Add HTC Modem Support
USB: Fixed outdated usb_get_device_descriptor() documentation
usb-storage: Remove duplicated unusual_devs.h entries for Sony Ericsson P990i
USB: hid-core: Add quirk for new Apple keyboard/trackpad
USB Storage: unusual_devs.h entry for Sony Ericsson P990i
USB: correct keymapping on Powerbook built-in USB ISO keyboards
USB: OHCI: fix root-hub resume bug
USB: Fix UCR-61S2B unusual_dev entry
USB: ftdi driver pid for dmx-interfaces
USB: ftdi_sio: adds vendor/product id for a RFID construction kit
OHCI: disallow autostop when wakeup is not available
Diffstat (limited to 'sound/oss/pas2_pcm.c')
0 files changed, 0 insertions, 0 deletions