diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-03 17:07:17 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-03 17:07:17 -0700 |
| commit | 4a4389abdd9822fdf3cc2ac6ed87eb811fd43acc (patch) | |
| tree | fd0da7010c1fe5878cd8b52eb6b01ba858e2f79f /security/selinux/include | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input (diff) | |
| parent | sb_edac: mark MCE messages as KERN_DEBUG (diff) | |
| download | linux-dev-4a4389abdd9822fdf3cc2ac6ed87eb811fd43acc.tar.xz linux-dev-4a4389abdd9822fdf3cc2ac6ed87eb811fd43acc.zip | |
Merge branch 'linux_next' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-edac
Pull sb_edac patches from Mauro Carvalho Chehab:
"A couple sb_edac driver improvements, cleaning a little bit the amount
of data sent to dmesg, and fixing one error message"
* 'linux_next' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-edac:
sb_edac: mark MCE messages as KERN_DEBUG
sb_edac: use "event" instead of "exception" when MC wasnt signaled
Diffstat (limited to 'security/selinux/include')
0 files changed, 0 insertions, 0 deletions