Skip to content
  • Linus Torvalds's avatar
    Merge tag 'char-misc-3.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc · 9f67627a
    Linus Torvalds authored
    Pull char/misc driver patches from Greg KH:
     "Here's the big char/misc driver patches for 3.14-rc1.
    
      Lots of little things, and a new "big" driver, genwqe.  Full details
      are in the shortlog"
    
    * tag 'char-misc-3.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (90 commits)
      mei: limit the number of consecutive resets
      mei: revamp mei reset state machine
      drivers/char: don't use module_init in non-modular ttyprintk.c
      VMCI: fix error handling path when registering guest driver
      extcon: gpio: Add power resume support
      Documentation: HOWTO: Updates on subsystem trees, patchwork, -next (vs. -mm) in ko_KR
      Documentation: HOWTO: update for 2.6.x -> 3.x versioning in ko_KR
      Documentation: HOWTO: update stable address in ko_KR
      Documentation: HOWTO: update LXR web link in ko_KR
      char: nwbutton: open-code interruptible_sleep_on
      mei: fix syntax in comments and debug output
      mei: nfc: mei_nfc_free has to be called under lock
      mei: use hbm idle state to prevent spurious resets
      mei: do not run reset flow from the interrupt thread
      misc: genwqe: fix return value check in genwqe_device_create()
      GenWQE: Fix warnings for sparc
      GenWQE: Fix compile problems for Alpha
      Documentation/misc-devices/mei/mei-amt-version.c: remove unneeded call of mei_deinit()
      GenWQE: Rework return code for flash-update ioctl
      sgi-xp: open-code interruptible_sleep_on_timeout
      ...
    9f67627a