Changes in .gitignore

1ad6364eeb4f578e423081d1748e8a3fdf1ab01d - Merge branch 'master' of git://git.denx.de/u-boot-arm

Wed, 05 Mar 2014 11:51:26 +0000

Merge branch 'master' of git://git.denx.de/u-boot-arm List of files: /rk3399_rockchip-uboot/arch/microblaze/dts/.gitignore

3e11350255d9c5d4bd03c2a65769da84c05d3294 - Merge branch 'u-boot/master' into 'u-boot-arm/master'

Thu, 20 Feb 2014 12:16:05 +0000

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/arch/microblaze/dts/.gitignore

3284c8b8cad9452bf0711f52699bc9a5aeb83319 - dts: generate multiple device tree blobs

Wed, 05 Feb 2014 02:28:27 +0000

dts: generate multiple device tree blobsIt is convenient to have all device trees on the same SoC compiled.It allows for later easy repackaging without the need to re-runthe make file. - Build device trees with the same SoC under arch/$(ARCH)/dts - Copy the one specified by CONFIG_DEFAULT_DEVICE_TREE or DEVICE_TREE=... to dts/dt.dtbSigned-off-by: Masahiro Yamada List of files: /rk3399_rockchip-uboot/arch/microblaze/dts/.gitignore