Changes in .gitignore en Copyright 2025 Java 1ad6364eeb4f578e423081d1748e8a3fdf1ab01d - Merge branch 'master' of git://git.denx.de/u-boot-arm http://opengrok.muzhidianzi.cn:8080/history/rk3399_rockchip-uboot/scripts/basic/.gitignore#1ad6364eeb4f578e423081d1748e8a3fdf1ab01d Merge branch 'master' of git://git.denx.de/u-boot-arm List of files: /rk3399_rockchip-uboot/scripts/basic/.gitignore Wed, 05 Mar 2014 11:51:26 +0000 Stefano Babic <sbabic@denx.de> 3e11350255d9c5d4bd03c2a65769da84c05d3294 - Merge branch 'u-boot/master' into 'u-boot-arm/master' http://opengrok.muzhidianzi.cn:8080/history/rk3399_rockchip-uboot/scripts/basic/.gitignore#3e11350255d9c5d4bd03c2a65769da84c05d3294 Merge branch 'u-boot/master' into 'u-boot-arm/master'Conflicts: Makefile drivers/net/npe/MakefileThese two conflicts arise from commit 0b2d3f20("ARM: NET: Remove the IXP NPE ethernet driver") and areresolved by deleting the drivers/net/npe/Makefile fileand removing the CONFIG_IXP4XX_NPE line from Makefile. List of files: /rk3399_rockchip-uboot/scripts/basic/.gitignore Thu, 20 Feb 2014 12:16:05 +0000 Albert ARIBAUD <albert.u.boot@aribaud.net> 22433fc54b19b0578c43a9983fa45f22ca262a0f - kbuild: import more build scripts from Linux v3.13 tag http://opengrok.muzhidianzi.cn:8080/history/rk3399_rockchip-uboot/scripts/basic/.gitignore#22433fc54b19b0578c43a9983fa45f22ca262a0f kbuild: import more build scripts from Linux v3.13 tagThis commit imports build scripts from Linux Kernel v3.13as they are.I know they include some trailing spacesbut I am intentionally keeping them untouched.Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com> List of files: /rk3399_rockchip-uboot/scripts/basic/.gitignore Tue, 04 Feb 2014 08:24:27 +0000 Masahiro Yamada <yamada.m@jp.panasonic.com>