rockchip: Remove rejected files with .rej suffix
authorMichal Simek <michal.simek@xilinx.com>
Tue, 5 Feb 2019 09:29:12 +0000 (10:29 +0100)
committerPhilipp Tomsich <philipp.tomsich@theobroma-systems.com>
Tue, 5 Feb 2019 09:34:04 +0000 (10:34 +0100)
commit30477f0500dac67e988498df3b6783372a31c22c
treebdd720d850129f2be8502a10750727f75d2fe045
parente5fd39c886485e3dec77f4438a6e364c2987cf5f
rockchip: Remove rejected files with .rej suffix

Probably output of incorrect applying introduced by

"rockchip: defconfig: Clean the unused pinctrl config"
(sha1: 2ec3d25f8faab51c2334174a582a96ad28d96344)

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Reviewed-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
configs/kylin-rk3036_defconfig.rej [deleted file]
configs/puma-rk3399_defconfig.rej [deleted file]