conflict resolve
authorAbdelRauf <quickwritereader@gmail.com>
Wed, 5 Jun 2019 20:50:50 +0000 (20:50 +0000)
committerAbdelRauf <quickwritereader@gmail.com>
Wed, 5 Jun 2019 20:50:50 +0000 (20:50 +0000)
commit148c4cc5fd4db4d10dcda94c5640de12611b7669
tree891123947d94d20988c61e9c3d0836022e96c9bd
parentd0c3543c3f38bbbdf363caa8c37bcf6df5bdb6fd
conflict resolve
kernel/power/KERNEL.POWER9