drm/rockchip: vop: power off until vop standby take effect
[firefly-linux-kernel-4.4.55.git] / Documentation / CodeOfConflict
2015-03-09 Dave AirlieMerge tag 'v4.0-rc3' into drm-next
2015-03-08 Linus TorvaldsMerge tag 'usb-4.0-rc3' of git://git./linux/kernel...
2015-03-08 Linus TorvaldsMerge tag 'tty-4.0-rc3' of git://git./linux/kernel...
2015-03-08 Linus TorvaldsMerge tag 'staging-4.0-rc3' of git://git./linux/kernel...
2015-03-08 Linus TorvaldsMerge tag 'char-misc-4.0-rc3' of git://git./linux/kerne...
2015-03-08 Linus TorvaldsMerge tag 'cc-4.0-rc2' of git://git./linux/kernel/git...
2015-02-27 Greg Kroah-HartmanCode of Conflict