diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2019-08-23 14:08:58 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2019-08-23 14:08:58 +1000 |
| commit | 4f8be0b4e32f5a256bf9180468a67629bc5d553b (patch) | |
| tree | c81b732b1396e8f60c7b30a4f090a191aed710ca /drivers/rtc | |
| parent | 0033928515b57a09677c66a3e62a9054d16f4e6c (diff) | |
| parent | b602614a81078bf29c82b2671bb96a63488f68d6 (diff) | |
Merge remote-tracking branch 'security/next-testing'
# Conflicts:
# arch/s390/configs/debug_defconfig
# arch/s390/configs/defconfig
# arch/s390/configs/performance_defconfig
# fs/tracefs/inode.c
# kernel/trace/trace_kprobe.c
# security/integrity/ima/Kconfig
Diffstat (limited to 'drivers/rtc')
0 files changed, 0 insertions, 0 deletions