diff options
author | James Morris <james.l.morris@oracle.com> | 2015-10-23 03:07:52 +0200 |
---|---|---|
committer | James Morris <james.l.morris@oracle.com> | 2015-10-23 03:07:52 +0200 |
commit | ba94c3ff20c9c179f2a80f0e4c71e1571ebbf5c7 (patch) | |
tree | 8f94d0fcb68cdcff0d00a7911ddb494705cf7c72 /fs/sysfs | |
parent | Merge branch 'upstream' of git://git.infradead.org/users/pcmoore/selinux into... (diff) | |
parent | KEYS: Merge the type-specific data with the payload data (diff) | |
download | linux-ba94c3ff20c9c179f2a80f0e4c71e1571ebbf5c7.tar.xz linux-ba94c3ff20c9c179f2a80f0e4c71e1571ebbf5c7.zip |
Merge tag 'keys-next-20151021' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs into next
Diffstat (limited to 'fs/sysfs')
0 files changed, 0 insertions, 0 deletions