Sign in before continuing.
Merge branch 'master' into percpu
Conflicts: arch/powerpc/platforms/pseries/hvCall.S include/linux/percpu.h
Loading
Please sign in to comment
Conflicts: arch/powerpc/platforms/pseries/hvCall.S include/linux/percpu.h