]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'linus' into perf/urgent, to resolve conflict
authorIngo Molnar <mingo@kernel.org>
Thu, 2 Mar 2017 07:05:45 +0000 (08:05 +0100)
committerIngo Molnar <mingo@kernel.org>
Thu, 2 Mar 2017 07:05:45 +0000 (08:05 +0100)
commit3ff9d9e58e4619e8b060a560716b66f6e45ab8bd
treeadcd4356b93b17b42c9e4ef95c3fea3afa52f3ee
parentd66ac69fa65f1b808f655adfd06126a7095b506d
parent43578c0be536de1579bbf8e5f4a07b00a01d3d1e
Merge branch 'linus' into perf/urgent, to resolve conflict

 Conflicts:
arch/powerpc/configs/85xx/kmp204x_defconfig

Signed-off-by: Ingo Molnar <mingo@kernel.org>