conflict resolve
authorAbdelRauf <quickwritereader@gmail.com>
Wed, 1 May 2019 19:36:22 +0000 (19:36 +0000)
committerAbdelRauf <quickwritereader@gmail.com>
Wed, 1 May 2019 19:36:22 +0000 (19:36 +0000)
commit47f892198cf98d8392b91377b5939a7dfc364e3b
treed7ce1a5863e74d030908a1da2b915a34ba76d0a2
parent628b335e8306829ac8e4ecd719d483d1d95a677b
conflict resolve
kernel/power/KERNEL.POWER9
kernel/power/icamax.c
kernel/power/icamin.c