From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 28 Aug 2014 00:32:37 +0000 (-0700)
Subject: Merge branch 'sec-v3.17-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/sergeh... 
X-Git-Tag: v3.17-rc3~26
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=f1bd473f95e02bc382d4dae94d7f82e2a455e05d;p=~emulex%2Finfiniband.git

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.
---

f1bd473f95e02bc382d4dae94d7f82e2a455e05d