• Michael Ellerman's avatar
    Merge branch 'fixes' into next · f1079d3a
    Michael Ellerman authored
    We ended up with an ugly conflict between fixes and next in ftrace.h
    involving multiple nested ifdefs, and the automatic resolution is
    wrong. So merge fixes into next so we can fix it up.
    f1079d3a
pci.c 67.1 KB