tree 404233d42dd50a0c4da0b0e63f4a16760f5e336f
parent ff0c57ac70434bc936cb0110eaf033a0a1a62e52
parent 8fe7a268b18ebc89203c766b020b9e32f1cfeebf
author Linus Torvalds <torvalds@linux-foundation.org> 1409185957 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1409185957 -0700

Merge branch 'sec-v3.17-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/sergeh/linux-security

Pull tomoyo fix from Serge Hallyn.

* 'sec-v3.17-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/sergeh/linux-security:
  tomoyo: Fix pathname calculation breakage.