Changes in .gitignore

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

Thu, 15 May 2014 08:27:32 +0000

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

d2a3e911390f9fc4d8c0ee4b3c7fc75f4fd3fd19 - Merge branch 'u-boot/master'

Fri, 09 May 2014 08:47:05 +0000

Merge branch 'u-boot/master'Conflicts: drivers/net/Makefile(trivial merge) List of files: /rk3399_rockchip-uboot/doc/DocBook/.gitignore

71ba24581c8b6fae2d6f04681c8a2fe310aec4c0 - kbuild: docbook: sync with Linux Kernel v3.15-rc1

Tue, 15 Apr 2014 04:30:51 +0000

kbuild: docbook: sync with Linux Kernel v3.15-rc1This commit imports DocBook-related updatesfrom v3.14 to v3.15-rc1. - commit ec3fadd64b9940baa2a369bf978e8561837db3f5 kbuild: docbook: use $(obj) and $(src) rather than specific path - commit 100da4c0150c97ce34d4d3b38bf2f5449b05ae4f kbuild: docbook: specify KERNELDOC dependency correctly - commit 6f89b9c1d6b29eaa600ac4a8ac1314b0d06f15e3 kbuild: docbook: include cmd files more simply - commit ac6d662a95a6989d83b259ccf8ec01dd7903af73 doc: Add "*.svg" to DocBook/.gitignore - commit 832919bfcf0cfd75767c68b0c61f7cf48be860a8 DocBook: Make mandocs parallel-safe - commit c4d79a4799719f2b0cd354ee498aad605730c97e work around xmlto bug in htmldocsSigned-off-by: Masahiro Yamada List of files: /rk3399_rockchip-uboot/doc/DocBook/.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/doc/DocBook/.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/doc/DocBook/.gitignore

ced032989a1b26851bc567df70199031dab37f19 - kernel-doc: update kernel-doc related files to Linux v3.13

Wed, 05 Feb 2014 01:52:51 +0000

kernel-doc: update kernel-doc related files to Linux v3.13Signed-off-by: Masahiro Yamada Acked-by: Simon Glass List of files: /rk3399_rockchip-uboot/doc/DocBook/.gitignore

30ff89189ba111268cfcde508ac4cc9f83eb9bcd - kerneldoc: Implant DocBook from Linux kernel

Sat, 06 Oct 2012 14:04:58 +0000

kerneldoc: Implant DocBook from Linux kernelPull slightly modified version of Documentation/DocBook, the related perlscript scripts/kernel-doc and the scripts/docproc.c from Linux kernel andimplant it into U-Boot. This will allow smooth generation of kerneldocstyle documentation.It was necessary to modify the DocBook/Makefile to work with U-Boot buildsystem. The changes were only minor though and involved replacing the kbuildspecific parts.It was also necessary to replace use of variables like KERNEL_VERSION withU_BOOT_VERSION, strings like Linux kernel with U-Boot Bootloader etc. sothe generated result actually matches.Finally, it was necessary to adjust docproc.c, since the documentation inU-Boot is located in doc/DocBook instead of Documentation/DocBook as is incase of the Linux kernel.Some parts of the DocBook Makefile are unused, but to allow easier sync withLinux kernel, these parts are still left in. The targets enabled now are"htmldocs" "pdfdocs" "psdocs" "xmldocs" and "cleandocs" to remove the resultsof documentation build.Linux scripts/docproc.c:commit f0f3ca8d967462dafb815412b14ca3339b9817a6Date: Wed Jun 15 11:53:13 2011 +0200Linux scripts/kernel-doc:commit 1b40c1944db445c1de1c47ffd8cd426167f488e8Date: Sun Aug 12 10:46:15 2012 +0200Linux Documentation/DocBook:commit bb8187d35f820671d6dd76700d77a6b55f95e2c5Date: Thu May 17 19:06:13 2012 -0400Signed-off-by: Marek Vasut List of files: /rk3399_rockchip-uboot/doc/DocBook/.gitignore