Skip to content
  • Linus Torvalds's avatar
    Merge tag 'staging-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging · def7cb8c
    Linus Torvalds authored
    
    
    Pull staging tree update from Greg Kroah-Hartman:
     "Here is the big staging tree update for the 3.7-rc1 merge window.
    
      There are a few patches in here that are outside of the staging area,
      namely HID and IIO patches, but all of them have been acked by the
      relevant subsystem maintainers.  The IIO stuff is still coming in
      through this tree as it hasn't entirely moved out of the staging tree,
      but is almost there.
    
      Other than that, there wa a ton of work on the comedi drivers to make
      them more readable and the correct style.  Doing that removed a lot of
      code, but we added a new driver to the staging tree, so we didn't end
      up with a net reduction this time around:
    
       662 files changed, 51649 insertions(+), 26582 deletions(-)
    
      All of these patches have been in the linux-next tree already.
    
    Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org&gt;">
    
    * tag 'staging-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (1094 commits)
      staging: comedi: jr3_pci: fix iomem dereference
      staging: comedi: drivers: use comedi_fc.h cmdtest helpers
      Staging: winbond: usb_free_urb(NULL) is safe
      Staging: winbond: checkpatch cleanup
      Staging: winbond: Removed undesired spaces, lines and tabs
      Staging: winbond: Typo corrections in comments
      Staging: winbond: Changed c99 comments to c89 comments
      staging: r8712u: Do not queue cloned skb
      staging: comedi: ni_mio_common: always lock in ni_ai_poll()
      staging: comedi: s626: add FIXME comment
      staging: comedi: s626: don't dereference insn->data
      staging: comedi: s526: fix if() check in s526_gpct_winsn()
      staging: comedi: s626: cleanup comments in s626_initialize()
      staging: comedi: s626: remove clear of kzalloc'ed data
      staging: comedi: s626: remove 'WDInterval' from private data
      staging: comedi: s626: remove 'ChargeEnabled' from private data
      staging: comedi: s626: remove 'IsBoardRevA' comment
      staging: comedi: s626: #if 0 out the "SAA7146 BUG WORKAROUND"
      staging: comedi: s626: remove 'allocatedBuf' from private data
      staging: comedi: s626: add final attach message
      ...
    def7cb8c