summaryrefslogtreecommitdiff
path: root/drivers/net/can/usb/esd_usb2.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2013-08-12 19:54:05 +0400
committerIngo Molnar <mingo@kernel.org>2013-08-12 19:54:05 +0400
commit0237d7f355eef4d9ab8557e1597e8c9debd6c8c2 (patch)
tree753837a9fb9e3f65bc7450994159683a47f086a6 /drivers/net/can/usb/esd_usb2.c
parentbf6c216282a260d3ce727c23fc15f28a76beff0b (diff)
parentcf870c70a194443f8fc654ddc9d6cfd02c58003b (diff)
downloadlinux-0237d7f355eef4d9ab8557e1597e8c9debd6c8c2.tar.xz
Merge branch 'x86/mce' into x86/ras
Pursue a single RAS/MCE topic branch on x86. Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/net/can/usb/esd_usb2.c')
0 files changed, 0 insertions, 0 deletions