projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 19240e6 b776e4b)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 26 Sep 2017 01:24:14 +0000 (18:24 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 26 Sep 2017 01:24:14 +0000 (18:24 -0700)
Pull compat fix from Al Viro:
 "I really wish gcc warned about conversions from pointer to function
  into void *..."

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  fix a typo in put_compat_shm_info()


Trivial merge
John Crispins staging tree