Merge branch 'sec-v3.17-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/sergeh...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 28 Aug 2014 00:32:37 +0000 (17:32 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 28 Aug 2014 00:32:37 +0000 (17:32 -0700)
commitf1bd473f95e02bc382d4dae94d7f82e2a455e05d
tree404233d42dd50a0c4da0b0e63f4a16760f5e336f
parentff0c57ac70434bc936cb0110eaf033a0a1a62e52
parent8fe7a268b18ebc89203c766b020b9e32f1cfeebf
Merge branch 'sec-v3.17-rc2' of git://git./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.