1. 28 Oct, 2013 38 commits
  2. 27 Oct, 2013 2 commits
    • Greg Kroah-Hartman's avatar
      staging: ktap: remove code from tree · 365aa51e
      Greg Kroah-Hartman authored
      ktap should be merged through the "proper" place in the kernel tree, in
      the perf tool, not as a stand-alone kernel module in staging.  So remove
      it from here for now so that it can be merged correctly later.
      Reported-by: default avatarIngo Molnar <mingo@kernel.org>
      Cc: Jovi Zhangwei <jovi.zhangwei@gmail.com>
      Cc: Steven Rostedt <rostedt@goodmis.org>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
      365aa51e
    • Greg Kroah-Hartman's avatar
      Merge tag 'iio-for-3.13e' of... · 9908b4f3
      Greg Kroah-Hartman authored
      Merge tag 'iio-for-3.13e' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-next
      
      Jonathan writes:
      
      Fifth round of IIO new drivers, cleanups and functionality for the 3.13 cycle.
      
      New Driver
      * Freescale mag3110 magnetometer driver.
      
      New functionality
      * Add LPS001WP support to the ST pressure driver.
      * Allow the max1363 driver to use only smbus functions for 8 bit devices. This
        allows the driver to be used when more extensive i2c support is not
        available.
      
      Cleanups
      * Fix incorrect description of unit conversions in ak8975.
      * Switch to pr_err in industrialio-core.c instead of direct printk calls.
      * Some simple redundant error handling removal patches.
      * Trivial warning suppression by adding brackets to a sizeof call.
      * Drop redundant of_match_ptr casts in drivers that are dependent on
        OF supporting being present.  The only purpose of the of_match_ptr
        wrapper was to make stubbing out of the relevant structures trivial.
      
      Fixes
      * Make MXS_LRADC depend on INPUT to avoid compile failures. This fixes an
        issue introduced in the previous pull in this cycle.
      9908b4f3