]> 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)
commit0b0661d43b62375ee50914fe2acfc6d714f3620f
treeadcd4356b93b17b42c9e4ef95c3fea3afa52f3ee
parent9bab10581f05ae3ababccde7bb8a1f5dde36898e
parenta8071864d8094daa424b5ea7956e733e0f05e6e5
Merge branch 'linus' into perf/urgent, to resolve conflict

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

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