]> git.proxmox.com Git - mirror_ubuntu-zesty-kernel.git/commit - drivers/hid/i2c-hid/i2c-hid.c
projects / mirror_ubuntu-zesty-kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: f09ff1d 2106752)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 20 Jan 2017 19:56:29 +0000 (11:56 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 20 Jan 2017 19:56:29 +0000 (11:56 -0800)
commiteefa9feb7dad40c45259f7bcbed054508564fa7d
tree2812e40c9c97ba5d8d28a066ccc1c1f039010a24tree
parentf09ff1de63a20bc049af66d2a758a6ded4f7bdf3commit | diff
parent210675270caa33253e4c33f3c5e657e7d6060812commit | diff
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse

Pull fuse fixes from Miklos Szeredi:
 "Fix two regressions, one introduced in 4.9 and a less recent one in
  4.2"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse:
  fuse: fix time_to_jiffies nsec sanity check
  fuse: clear FR_PENDING flag when moving requests out of pending queue
ubuntu-zesty-kernel mirror