projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 29169f8 5242d42)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 28 Dec 2014 21:02:27 +0000 (13:02 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 28 Dec 2014 21:02:27 +0000 (13:02 -0800)
Pull vfs fix from Al Viro:
 "An embarrassing bug in lustre patches from this cycle ;-/"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  [regression] braino in "lustre: use is_root_inode()"


Trivial merge
John Crispins staging tree