]> Git Repo - linux.git/commitdiff
Merge branch 'linus' into perf/urgent, to resolve conflict
authorIngo Molnar <[email protected]>
Thu, 2 Mar 2017 07:05:45 +0000 (08:05 +0100)
committerIngo Molnar <[email protected]>
Thu, 2 Mar 2017 07:05:45 +0000 (08:05 +0100)
 Conflicts:
arch/powerpc/configs/85xx/kmp204x_defconfig

Signed-off-by: Ingo Molnar <[email protected]>

Trivial merge
This page took 0.051136 seconds and 4 git commands to generate.