Skip to content
  1. Feb 12, 2014
  2. Feb 09, 2014
    • Greg Kroah-Hartman's avatar
      Merge branch 'staging-linus' into staging-work · 7ca363f6
      Greg Kroah-Hartman authored
      
      
      This is to pull in the lustre fixes so that others can continue to work
      on updating the lustre codebase, as well as resolve some merge issues
      with the ion and ocproto drivers to keep linux-next happy.
      
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
      7ca363f6
    • Greg Kroah-Hartman's avatar
      Merge tag 'iio-fixes-for-3.14b' of... · a0f45252
      Greg Kroah-Hartman authored
      Merge tag 'iio-fixes-for-3.14b' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-linus
      
      Jonathan writes:
      
      Second round of IIO fixes for the 3.14 cycle.
      
      Another mixed bag, including some that were not in round 1 because
      they applied to elements that went in during the merge window whereas
      round 1 predated that.  I have been effectively out of action for 3 weeks
      so will take a little while to catch up with my backlog.
      
      * mag3110 - report busy in read_raw / write_raw when buffered capture
        is underway to avoid either changing the characteristics of the capture or
        causing capture issues by reading data destined for the buffer.
      * mag3110 - fix a failure to specify leading zeros when formatting a decimal
        number.
      * lradc - fix a buffer overflow and incorrect reporting of scale for voltage
        channel 15
      * lradc - drop some scale_available attributes for elements that don't actually
        exist.  These could otherwise cause some interesting issues for userspace.
      * ad799x - a typo in the events information mask resulted in some nasty crashes
        on failed probes.
      * ak8975 - fix scale attribute output to avoid incorrect intepretation of
        readings in userspace.
      * adis16400 - make sure the timestamp is the last element in all channel_spec
        arrays as this assumption is made by the buffer filling code, but was not
        true previously.
      * bma180 - correctly use modifiers to distinguish the channels rather than
        indexes.  This brings the abi inline with the standard option for 3 axis
        accelerometers.
      * max1363 - use devm_regulator_get_optional instead of the non optional case
        to allow the device to successfully probe when a regulator is not specified.
      a0f45252
  3. Feb 08, 2014