projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ff0c57a 8fe7a26)
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)
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.


Trivial merge