Skip to content
  • Linus Torvalds's avatar
    Merge tag 'staging-3.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging · fdc719b6
    Linus Torvalds authored
    Pull staging driver tree update from Greg Kroah-Hartman:
     "Here's the big staging driver tree update for 3.10-rc1
    
      This update contains loads of comedi driver cleanups and fixes in
      here, iio updates, android driver changes, and other various staging
      driver cleanups.
    
      Thanks to some drivers being removed, and the comedi driver cleanups,
      we have removed more code than we added:
    
       627 files changed, 65145 insertions(+), 76321 deletions(-)
    
      which is always nice to see.
    
      All of these have been in linux-next for a while."
    
    * tag 'staging-3.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (940 commits)
      staging: comedi: ni_labpc: fix legacy driver build
      staging: comedi: das800: cleanup the cio-das802/16 fifo comments
      staging: comedi: das800: rename CamelCase vars in das800_ai_do_cmd()
      staging: comedi: das800: tidy up the private data
      staging: comedi: das800: tidy up das800_interrupt()
      staging: comedi: das800: tidy up das800_ai_insn_read()
      staging: comedi: das800: tidy up das800_di_insn_bits()
      staging: comedi: das800: tidy up das800_do_insn_bits()
      staging: comedi: das800: remove extra divisor calculation call
      staging: comedi: das800: rename {enable,disable}_das800
      staging: comedi: das800: tidy up subdevice init
      staging: comedi: das800: allow attaching without interrupt support
      staging: comedi: das800: interrupts are required for async command support
      staging: comedi: das800: tidy up das800_ai_do_cmdtest()
      staging: comedi: das800: remove 'volatile' on private data variables
      staging: comedi: das800: cleanup the boardinfo
      staging: comedi: das800: cleanup range table declarations
      staging: comedi: das800: introduce das800_ind_{write, read}()
      staging: comedi: das800: remove forward declarations
      staging: comedi: das800: move das800_set_frequency()
      ...
    fdc719b6