1. 24 5月, 2007 36 次提交
  2. 23 5月, 2007 4 次提交
    • L
      Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 · 4598c955
      Linus Torvalds 提交于
      * 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
        [RTNETLINK]: Remove remains of wireless extensions over rtnetlink
        [RTNETLINK]: Allow changing of subsets of netdevice flags in rtnl_setlink
        [AF_RXRPC]: Make call state names available if CONFIG_PROC_FS=n
        [AF_RXRPC]: AF_RXRPC depends on IPv4
        [IPSEC]: Fix warnings with casting int to pointer
      4598c955
    • L
      Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6 · 641e22e0
      Linus Torvalds 提交于
      * master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6: (29 commits)
        USB: Add support for Olimex arm-usb-ocd JTAG interface serial port
        USB: Add support for Sierra Wireless Aircard 595U
        USB: ldusb bugfix
        USB: ftdi_sio: Add USB Product Id for OpenDCC
        USB: fix ratelimit call semantics
        USB: handle errors in power/level attribute
        USB: make the autosuspend workqueue thread freezable
        USB: Fix USB OHCI Subvendor for Toshiba Portege 4000
        USB: usblp: Use correct DMA address in case of probe error
        USB: Fix debug output of ark3116
        USB: Onetouch - switch to using input_dev->dev.parent
        USB: don't try to kzalloc 0 bytes
        USB: remove short initial timeout for device descriptor fetch
        USB: Deref URB after usbmon is done with it
        USB: Remove duplicate IDs from option card driver
        USB: auerswald: fix file release handler
        USB: fsl_usb2_udc: Fix UMTI_WIDE support and a compile warning
        USB: set the correct Interrupt interval in usb_bulk_msg
        USB: New device PID for ftdi_sio driver
        USB: remove unneeded WARN_ON
        ...
      641e22e0
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input · 31f6e1bd
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
        Input: ads7846 - SPI_CPHA mode bugfix
        Input: ads7846 - document that it handles tsc2046 too
        Input: input-polldev - add module info
        Input: ucb1x00-ts - remove commented out code
        Input: ucb1400_ts - use sched_setscheduler()
        Input: ALPS - force stream mode
        Input: iforce - minor clean-ups
        Input: iforce - fix force feedback not working
        Input: adbhid - do not access input_dev->private directly
        Input: logips2pp - add type 72 (PS/2 TrackMan Marble)
      31f6e1bd
    • T
      USB: Add support for Olimex arm-usb-ocd JTAG interface serial port · fa91d43b
      Tony Lindgren 提交于
      This patch adds support for the serial port on Olimex arm-usb-ocd
      JTAG interface.
      
      The device appears as two serial ports, but the first one is reserved
      for the JTAG interface. The JTAG interface can be used with OpenOCD
      from userspace. For more information, please see:
      
      http://openocd.berlios.de/web/
      http://www.olimex.com/dev/arm-usb-ocd.htmlSigned-off-by: NTony Lindgren <tony@atomide.com>
      Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>
      fa91d43b