1. 20 3月, 2010 3 次提交
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 · 8fdb7e9f
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (45 commits)
        USB: gadget/multi: cdc_do_config: remove redundant check
        usb: r8a66597-hcd: fix removed from an attached hub
        USB: xhci: Make endpoint interval debugging clearer.
        USB: Fix usb_fill_int_urb for SuperSpeed devices
        USB: cp210x: Remove double usb_control_msg from cp210x_set_config
        USB: Remove last bit of CONFIG_USB_BERRY_CHARGE
        USB: gadget: add gadget controller number for s3c-hsotg driver
        USB: ftdi_sio: Fix locking for change_speed() function
        USB: g_mass_storage: fixed module name in Kconfig
        USB: gadget: f_mass_storage::fsg_bind(): fix error handling
        USB: g_mass_storage: fix section mismatch warnings
        USB: gadget: fix Blackfin builds after gadget cleansing
        USB: goku_udc: remove potential null dereference
        USB: option.c: Add Pirelli VID/PID and indicate Pirelli's modem interface is 0xff
        USB: serial: Fix module name typo for qcaux Kconfig entry.
        usb: cdc-wdm: Fix deadlock between write and resume
        usb: cdc-wdm: Fix order in disconnect and fix locking
        usb: cdc-wdm:Fix loss of data due to autosuspend
        usb: cdc-wdm: Fix submission of URB after suspension
        usb: cdc-wdm: Fix race between disconnect and debug messages
        ...
      8fdb7e9f
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client · fc7f99cf
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client: (205 commits)
        ceph: update for write_inode API change
        ceph: reset osd after relevant messages timed out
        ceph: fix flush_dirty_caps race with caps migration
        ceph: include migrating caps in issued set
        ceph: fix osdmap decoding when pools include (removed) snaps
        ceph: return EBADF if waiting for caps on closed file
        ceph: set osd request message front length correctly
        ceph: reset front len on return to msgpool; BUG on mismatched front iov
        ceph: fix snaptrace decoding on cap migration between mds
        ceph: use single osd op reply msg
        ceph: reset bits on connection close
        ceph: remove bogus mds forward warning
        ceph: remove fragile __map_osds optimization
        ceph: fix connection fault STANDBY check
        ceph: invalidate_authorizer without con->mutex held
        ceph: don't clobber write return value when using O_SYNC
        ceph: fix client_request_forward decoding
        ceph: drop messages on unregistered mds sessions; cleanup
        ceph: fix comments, locking in destroy_inode
        ceph: move dereference after NULL test
        ...
      
      Fix trivial conflicts in Documentation/ioctl/ioctl-number.txt
      fc7f99cf
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6 · 0a492fde
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
        cifs: trivial white space
        [CIFS] checkpatch cleanup
        cifs: add cifs_revalidate_file
        cifs: add a CIFSSMBUnixQFileInfo function
        cifs: add a CIFSSMBQFileInfo function
        cifs: overhaul cifs_revalidate and rename to cifs_revalidate_dentry
      0a492fde
  2. 19 3月, 2010 37 次提交