Changes in .gitignore

dab5e3469d294a4e1ffed8407d296a78e02cc01f - Merge branch 'master' of git://git.denx.de/u-boot

Wed, 16 Jul 2014 06:51:30 +0000

Merge branch 'master' of git://git.denx.de/u-bootSigned-off-by: Stefano Babic Conflicts: boards.cfg List of files: /rk3399_rockchip-uboot/arch/.gitignore

ed1d98d801dfb6384d0f2fff45ce1ebf884944ca - Merge branch 'u-boot/master' into 'u-boot-arm/master'

Wed, 25 Jun 2014 08:39:58 +0000

Merge branch 'u-boot/master' into 'u-boot-arm/master' List of files: /rk3399_rockchip-uboot/arch/.gitignore

0ffc986ac8c7c61e27f601149bef8371882061b3 - .gitignore: drop include/asm/proc from ignore pattern

Thu, 12 Jun 2014 05:37:35 +0000

.gitignore: drop include/asm/proc from ignore patternCommit 7d89982b stopped creating symbolic linkarch/${arch}/include/asm/proc.arch/.gitignore should be updated.Signed-off-by: Masahiro Yamada Cc: Vasili Galka List of files: /rk3399_rockchip-uboot/arch/.gitignore

922d27b596c179c5a7d68abe45ede5adb1b6589c - Merge branch 'master' of git://git.denx.de/u-boot-arm

Mon, 31 May 2010 00:13:11 +0000

Merge branch 'master' of git://git.denx.de/u-boot-armConflicts: arch/arm/include/asm/mach-types.hSigned-off-by: Minkyu Kang List of files: /rk3399_rockchip-uboot/arch/.gitignore

f745817e741e4251afbd9d5d7f04b2419f4aa9d9 - update include/asm/ gitignore after move

Tue, 27 Apr 2010 18:15:34 +0000

update include/asm/ gitignore after moveWith the cpu include paths moved, the gitignore paths need updating.Signed-off-by: Mike Frysinger Tested-by: Tom Rix List of files: /rk3399_rockchip-uboot/arch/.gitignore