summaryrefslogtreecommitdiff
path: root/include/media
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-04-03 17:07:17 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2014-04-03 17:07:17 -0700
commit4a4389abdd9822fdf3cc2ac6ed87eb811fd43acc (patch)
treefd0da7010c1fe5878cd8b52eb6b01ba858e2f79f /include/media
parent73f10274a6c8699738246ed2e1d704dc52702565 (diff)
parent49856dc973cd95d85ac1cab6c70410d8331e5c04 (diff)
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 'include/media')
0 files changed, 0 insertions, 0 deletions