diff options
| author | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2015-12-08 10:11:38 +0100 |
|---|---|---|
| committer | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2015-12-08 10:11:38 +0100 |
| commit | d2800e9cfd6bb876f597adbb806de21774067413 (patch) | |
| tree | 5236f073d5af51d5060a46d09884a55b36ea3440 /fs/ecryptfs/ecryptfs_kernel.h | |
| parent | 3fe26611bb4999c3717d3aface0bac722b9d2653 (diff) | |
| parent | afabf37012e839802f9f3819f621e16aa4acefd2 (diff) | |
| download | kernel_samsung_smdk4412-d2800e9cfd6bb876f597adbb806de21774067413.zip kernel_samsung_smdk4412-d2800e9cfd6bb876f597adbb806de21774067413.tar.gz kernel_samsung_smdk4412-d2800e9cfd6bb876f597adbb806de21774067413.tar.bz2 | |
Merge commit 'afabf37012e839802f9f3819f621e16aa4acefd2' into upstreaming
update from cm-13.0
Conflicts:
Makefile
crypto/algapi.c
drivers/char/diag/diagchar.h
drivers/char/diag/diagchar_core.c
drivers/misc/Makefile
kernel/timeconst.pl
Diffstat (limited to 'fs/ecryptfs/ecryptfs_kernel.h')
0 files changed, 0 insertions, 0 deletions