diff options
author | Takashi Iwai <tiwai@suse.de> | 2019-07-01 17:01:00 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2019-07-01 17:01:55 +0200 |
commit | b5c21c84705dbd96a0fff930d33022a17910b4f4 (patch) | |
tree | a080aa4383c8f4ffb91225d234ac9b530b2ff0fa /security/smack | |
parent | 7c2b3629d09ddec810dc4c1d3a6657c32def8f71 (diff) | |
parent | 7fbd1753b64eafe21cf842348a40a691d0dee440 (diff) |
Merge branch 'for-linus' into for-next
This back-merge is necessary for adjusting the latest FireWire fix
with the recent refactoring in 5.3 development branch.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'security/smack')
0 files changed, 0 insertions, 0 deletions