diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-05-04 11:14:00 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-05-04 11:14:00 -0700 |
| commit | 4810d9682971e8eee659f96e4f9d9154e3c6c0b4 (patch) | |
| tree | 80a19f6ab582122f8d8f85256a2869f3a83e9edf /drivers/scsi/eata_pio.c | |
| parent | 41143b774af2b37c24026521e6eae4c914bd731d (diff) | |
| parent | cf90ea934028375805e2d39c796eb276001574d7 (diff) | |
| download | talos-obmc-linux-4810d9682971e8eee659f96e4f9d9154e3c6c0b4.tar.gz talos-obmc-linux-4810d9682971e8eee659f96e4f9d9154e3c6c0b4.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
Pull IMA fix from James Morris.
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
ima: fix the string representation of the LSM/IMA hook enumeration ordering
Diffstat (limited to 'drivers/scsi/eata_pio.c')
0 files changed, 0 insertions, 0 deletions
