1. 22 9月, 2014 38 次提交
  2. 21 9月, 2014 2 次提交
    • L
      Merge tag 'staging-3.17-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging · 3c2ea702
      Linus Torvalds 提交于
      Pull staging / IIO fixes from Greg KH:
       "Here are some IIO and Staging driver fixes for 3.17-rc6.  They are all
        pretty simple, and resolve reported issues"
      
      * tag 'staging-3.17-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
        staging: vt6655: buffer overflow in ioctl
        iio:magnetometer: bugfix magnetometers gain values
        iio: adc: at91: don't use the last converted data register
        iio: adc: xilinx-xadc: assign auxiliary channels address correctly
        iio: meter: ade7758: Fix indio_dev->trig assignment
        iio: inv_mpu6050: Fix indio_dev->trig assignment
        iio: gyro: itg3200: Fix indio_dev->trig assignment
        iio: st_sensors: Fix indio_dev->trig assignment
        iio: hid_sensor_hub: Fix indio_dev->trig assignment
        iio: adc: ad_sigma_delta: Fix indio_dev->trig assignment
        iio: accel: bma180: Fix indio_dev->trig assignment
        iio:trigger: modify return value for iio_trigger_get
        iio:inkern: fix overwritten -EPROBE_DEFER in of_iio_channel_get_by_name
      3c2ea702
    • L
      Merge tag 'usb-3.17-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb · c1fb79e2
      Linus Torvalds 提交于
      Pull USB fixes / quirks from Greg KH:
       "Here are some USB and PHY fixes and quirks for 3.17-rc6.  Nothing
        major, just a few things that have been reported"
      
      * tag 'usb-3.17-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb:
        USB: storage: Add quirks for Entrega/Xircom USB to SCSI converters
        USB: storage: Add quirk for Ariston Technologies iConnect USB to SCSI adapter
        USB: storage: Add quirk for Adaptec USBConnect 2000 USB-to-SCSI Adapter
        USB: EHCI: unlink QHs even after the controller has stopped
        phy: spear1340-miphy: fix driver dependencies
        phy: spear1310-miphy: fix driver dependencies
        phy: miphy365x: Fix off-by-one error
      c1fb79e2