diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-09-05 00:28:47 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-09-05 00:28:47 -0700 |
| commit | 5147a136f3ade69b9ce12afc022b1c37d43cf5d8 (patch) | |
| tree | a33af1b06f2000ab82cc0527442de108c668843c /series | |
| parent | eea487fa0daadea3dbe2c25b9db5881976643e09 (diff) | |
| parent | 470ec5b9affc1625ee67df9e74701e51973d7cdf (diff) | |
| download | patches-5147a136f3ade69b9ce12afc022b1c37d43cf5d8.tar.gz | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/gregkh/patches
Conflicts:
series
Diffstat (limited to 'series')
| -rw-r--r-- | series | 9 |
1 files changed, 9 insertions, 0 deletions
@@ -17,6 +17,7 @@ tty.current/vt-fix-console-corruption-on-driver-hand-over.patch tty.current/maintainers-orphan-isicom.patch tty.current/serial-fix-port-type-conflict-between-ns16550a-u6_16550a.patch tty.current/serial-bfin_sport_uart-restore-transmit-frame-sync-fix.patch +tty.current/tty-fix-tty_line-must-not-be-equal-to-number-of-allocated-tty-pointers-in-tty-driver.patch # after patches sent to linus tty.current/serial-amba-pl010-fix-set_ldisc.patch @@ -39,6 +40,10 @@ usb.current/usb-serial-mos7840-add-usb-id-to-support-the-b-b-electronics-usoptl4 usb.current/usb-cdc-acm-adding-second-acm-channel-support-for-various-nokia-and-one-samsung-phones.patch usb.current/usb-serial-mos7840-add-usb-ids-to-support-more-b-b-usb-rs485-converters.patch usb.current/usb-cxacru-use-a-bulk-int-urb-to-access-the-command-endpoint.patch +usb.current/usb-cdc-acm-add-pseudo-modem-without-at-command-capabilities.patch +usb.current/usb-cdc-acm-fixing-crash-when-acm-probing-interfaces-with-no-endpoint-descriptors.patch +usb.current/usb-ftdi_sio-added-custom-pids-for-chamsys-products.patch + ################################# @@ -48,6 +53,7 @@ staging.current/staging-hv-fix-missing-functions-for-net_device_ops.patch staging.current/staging-hv-fixed-bounce-kmap-problem-by-using-correct-index.patch staging.current/staging-hv-fixed-the-value-of-the-64bit-hole-inside-ring-buffer.patch staging.current/staging-hv-increased-storvsc-ringbuffer-and-max_io_requests.patch +staging.current/staging-hv-fixed-lockup-problem-with-bounce_buffer-scatter-list.patch staging.current/staging-spectra-needs-linux-slab.h.patch staging.current/staging-comedi-das08_cs.c-fix-io_req_t-conversion.patch staging.current/staging-rt2870sta-add-more-device-ids-from-vendor-drivers.patch @@ -74,6 +80,8 @@ driver-core/dynamic-debug-introduce-global-fake-module-param-module.ddebug.patch driver-core/driver-core-platform-use-drv-driver.bus-instead-of-assuming-platform_bus_type.patch driver-core/uio-do-not-use-pci-resources-before-pci_enable_device.patch driver-core/driver-core-platform_bus-allow-runtime-override-of-dev_pm_ops.patch +driver-core/add-packet-hub-driver-for-topcliff-platform-controller-hub.patch +driver-core/pch_phub-fix-build-warnings.patch # can we really almost drop it? please let it happen this time... driver-core/driver-core-remove-config_sysfs_deprecated_v2-but-keep-it-for-block-devices.patch @@ -130,6 +138,7 @@ usb/usb-gadget-don-t-save-bind-callback-in-struct-usb_configuration.patch usb/init.h-add-some-more-documentation-to-__ref-tags.patch usb/usb-gadget-amd5536udc.c-remove-double-test.patch usb/usb-output-an-error-message-when-the-pipe-type-doesn-t-match-the-endpoint-type.patch +usb/usb-langwell-remove-unnecessary-return-s-from-void-functions.patch usb/usb-g_file_storage-don-t-generate-automatic-serial-string.patch # staging stuff for next is now in the staging-next tree on git.kernel.org |