diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-08-28 02:32:37 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-08-28 02:32:37 +0200 |
commit | f1bd473f95e02bc382d4dae94d7f82e2a455e05d (patch) | |
tree | 404233d42dd50a0c4da0b0e63f4a16760f5e336f /Documentation/dma-buf-sharing.txt | |
parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jik... (diff) | |
parent | tomoyo: Fix pathname calculation breakage. (diff) | |
download | linux-f1bd473f95e02bc382d4dae94d7f82e2a455e05d.tar.xz linux-f1bd473f95e02bc382d4dae94d7f82e2a455e05d.zip |
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.
Diffstat (limited to 'Documentation/dma-buf-sharing.txt')
0 files changed, 0 insertions, 0 deletions